add services and submodule

11 files changed, 119 insertions, 52 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3b293fa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+swag/etc-config-swag/www/rss/index.php
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..bf51d92
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tnt-search"]
+	path = tnt-search
+	url = https://git.tilde.institute/birabittoh/tnt-search/
diff --git a/invidious/docker-compose.yaml b/invidious/docker-compose.yaml
index da9a6e6..8eb4f93 100644
--- a/invidious/docker-compose.yaml
+++ b/invidious/docker-compose.yaml
@@ -15,7 +15,7 @@ services:
           port: 5432
         check_tables: true
         popular_enabled: false
-        registration_enabled: true
+        registration_enabled: false
         statistics_enabled: false
         hsts: false
         https_only: true
@@ -47,6 +47,8 @@ services:
       POSTGRES_PASSWORD: password
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
+    networks:
+      - default
 
 volumes:
   postgresdata:
diff --git a/libreddit/docker-compose.yaml b/libreddit/docker-compose.yaml
new file mode 100644
index 0000000..19dde93
--- /dev/null
+++ b/libreddit/docker-compose.yaml
@@ -0,0 +1,23 @@
+version: "3.8"
+
+services:
+  web:
+    image: libreddit/libreddit:latest
+    restart: unless-stopped
+    container_name: "libreddit"
+    user: nobody
+    read_only: true
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+    networks:
+      - swag_default
+    healthcheck:
+      test: ["CMD", "wget", "--spider", "-q", "--tries=1", "http://localhost:8080/settings"]
+      interval: 5m
+      timeout: 3s
+
+networks:
+  swag_default:
+    external: true
diff --git a/scribe/docker-compose.yaml b/scribe/docker-compose.yaml
new file mode 100644
index 0000000..2a225da
--- /dev/null
+++ b/scribe/docker-compose.yaml
@@ -0,0 +1,25 @@
+version: "3"
+services:
+  app:
+    container_name: scribe
+    image: miklobit/scribe:latest
+    restart: unless-stopped
+    #ports:
+    #  - 8080:8080
+    environment:
+      - SCRIBE_PORT=8080
+      - SCRIBE_HOST=0.0.0.0
+      #- SCRIBE_DB=postgres://does@not/matter
+      - APP_DOMAIN=https://m.birabittoh.duckdns.org
+      #- LUCKY_ENV=production
+      #- SECRET_KEY_BASE=e6ab1cf6557cc1b20c0a082f05001c842db5bbd6
+      #- PORT=8080
+      #- DATABASE_URL=postgres://does@not/matter
+    networks:
+      - default
+      - swag_default
+
+networks:
+  default:
+  swag_default:
+    external: true
diff --git a/swag/etc-config-swag/nginx/proxy-confs/freshrss.subdomain.conf b/swag/etc-config-swag/nginx/proxy-confs/freshrss.subdomain.conf
deleted file mode 100644
index 8747718..0000000
--- a/swag/etc-config-swag/nginx/proxy-confs/freshrss.subdomain.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-## Version 2023/05/31
-# make sure that your freshrss container is named freshrss
-# make sure that your dns has a cname set for freshrss
-
-server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-
-    server_name rss.*;
-
-    include /config/nginx/ssl.conf;
-
-    client_max_body_size 0;
-
-    # enable for ldap auth (requires ldap-location.conf in the location block)
-    #include /config/nginx/ldap-server.conf;
-
-    # enable for Authelia (requires authelia-location.conf in the location block)
-    #include /config/nginx/authelia-server.conf;
-
-    # enable for Authentik (requires authentik-location.conf in the location block)
-    #include /config/nginx/authentik-server.conf;
-
-    location / {
-        # enable the next two lines for http auth
-        #auth_basic "Restricted";
-        #auth_basic_user_file /config/nginx/.htpasswd;
-
-        # enable for ldap auth (requires ldap-server.conf in the server block)
-        #include /config/nginx/ldap-location.conf;
-
-        # enable for Authelia (requires authelia-server.conf in the server block)
-        #include /config/nginx/authelia-location.conf;
-
-        # enable for Authentik (requires authentik-server.conf in the server block)
-        #include /config/nginx/authentik-location.conf;
-
-        include /config/nginx/proxy.conf;
-        include /config/nginx/resolver.conf;
-        set $upstream_app freshrss;
-        set $upstream_port 80;
-        set $upstream_proto http;
-        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-
-        proxy_buffering off;
-        proxy_set_header X-Forwarded-Port $server_port;
-        proxy_cookie_path / "/; HTTPOnly; Secure";
-        proxy_set_header Authorization $http_authorization;
-        proxy_pass_header Authorization;
-    }
-}
diff --git a/swag/etc-config-swag/nginx/proxy-confs/kriss.subdomain.conf b/swag/etc-config-swag/nginx/proxy-confs/kriss.subdomain.conf
new file mode 100644
index 0000000..002fa8e
--- /dev/null
+++ b/swag/etc-config-swag/nginx/proxy-confs/kriss.subdomain.conf
@@ -0,0 +1,21 @@
+server {
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+
+    server_name rss.*;
+  
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    root /config/www/rss;
+
+    index index.php;
+
+    location ~ ^(.+\.php)(.*)$ {
+        fastcgi_split_path_info ^(.+\.php)(.*)$;
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_index index.php;
+        include /etc/nginx/fastcgi_params;
+    }
+}
diff --git a/swag/etc-config-swag/nginx/proxy-confs/libreddit.subdomain.conf b/swag/etc-config-swag/nginx/proxy-confs/libreddit.subdomain.conf
new file mode 100644
index 0000000..2da1d08
--- /dev/null
+++ b/swag/etc-config-swag/nginx/proxy-confs/libreddit.subdomain.conf
@@ -0,0 +1,19 @@
+server {
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+
+    server_name r.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    location / {
+        include /config/nginx/proxy.conf;
+        include /config/nginx/resolver.conf;
+        set $upstream_app libreddit;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+    }
+}   
diff --git a/swag/etc-config-swag/nginx/proxy-confs/scribe.subdomain.conf b/swag/etc-config-swag/nginx/proxy-confs/scribe.subdomain.conf
new file mode 100644
index 0000000..46769ea
--- /dev/null
+++ b/swag/etc-config-swag/nginx/proxy-confs/scribe.subdomain.conf
@@ -0,0 +1,19 @@
+server {
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+
+    server_name m.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    location / {
+        include /config/nginx/proxy.conf;
+        include /config/nginx/resolver.conf;
+        set $upstream_app scribe;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+    }
+}   
diff --git a/swag/etc-config-swag/www/rss/update.sh b/swag/etc-config-swag/www/rss/update.sh
new file mode 100755
index 0000000..0edd021
--- /dev/null
+++ b/swag/etc-config-swag/www/rss/update.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+LINK=https://raw.githubusercontent.com/tontof/kriss_feed/master/
+FILENAME=index.php
+
+wget -O $(dirname "$0")/$FILENAME $LINK$FILENAME
diff --git a/tnt-search b/tnt-search
new file mode 160000
+Subproject e4a7499891618963e068e07e6aadf42a6c9d3df