From 2bcb65c28670d1b48f87dd876152554197e79c1b Mon Sep 17 00:00:00 2001
From: Chris <stofflees@gmail.com>
Date: Sun, 23 Jul 2023 20:10:01 +0100
Subject: [PATCH] Fix Tiny Tiny RSS

---
 docker-compose.yml        | 33 +++++++++++++++++----------------
 nginx/nginx.conf.template | 26 ++++----------------------
 2 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ea5b461..f3a55b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -139,9 +139,9 @@ services:
       - TTRSS_DB_NAME=scarif
       - TTRSS_DB_PASS=${DB_PASSWORD}
       - TTRSS_DB_HOST=psqldb
-      #- AUTO_CREATE_USER=${TTRSS_USER}
-      #- AUTO_CREATE_USER_PASS=${TTRSS_USER_PASS}
-      #- AUTO_CREATE_USER_ACCESS_LEVEL:
+      - AUTO_CREATE_USER=${TTRSS_USER}
+      - AUTO_CREATE_USER_PASS=${TTRSS_USER_PASS}
+      - ADMIN_USER_ACCESS_LEVEL=-2
     volumes:
       - tt-rss:/var/www/html
       - ./tt-rss/config.d:/opt/tt-rss/config.d:ro
@@ -527,19 +527,6 @@ services:
     networks:
       - db
 
-  psqldb:
-    <<: *logging
-    image: postgres:12-alpine
-    restart: unless-stopped
-    environment:
-      - POSTGRES_USER=${DB_USER}
-      - POSTGRES_PASSWORD=${DB_PASSWORD}
-      - POSTGRES_DB=scarif
-    volumes:
-      - psqldb:/var/lib/postgresql/data
-    networks:
-      - db
-
   redis:
     image: redis:alpine
     restart: always
@@ -565,6 +552,7 @@ services:
       - collabora
       - pihole
       - foundry
+      - tt-rss
     ports:
       - 443:443
     networks:
@@ -579,6 +567,19 @@ services:
       - SSL_CSR=/certs/${DOMAIN}.csr
       - SSL_CERT=/certs/${DOMAIN}.crt
 
+  psqldb:
+    <<: *logging
+    image: postgres:12-alpine
+    restart: unless-stopped
+    environment:
+      - POSTGRES_USER=${DB_USER}
+      - POSTGRES_PASSWORD=${DB_PASSWORD}
+      - POSTGRES_DB=scarif
+    volumes:
+      - psqldb:/var/lib/postgresql/data
+    networks:
+      - db
+
 volumes:
   db:
   psqldb:
diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.template
index 5c0749f..b3ba8b8 100644
--- a/nginx/nginx.conf.template
+++ b/nginx/nginx.conf.template
@@ -292,39 +292,21 @@ http {
         ssl_certificate /etc/nginx/certs/${DOMAIN}.crt;
         ssl_certificate_key /etc/nginx/certs/${DOMAIN}.key;
 
+        index index.php index.html;
+
         root /var/www/html/tt-rss;
 
         server_name intel.${DOMAIN};
 
-	location /cache {
-            aio threads;
-	    internal;
-	}
-
-        location /backups {
-            internal;
-        }
-
         location ~ \.php$ {
-            # regex to split $uri to $fastcgi_script_name and $fastcgi_path
             fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-
-            # Check that the PHP script exists before passing it
-            try_files $fastcgi_script_name =404;
-
-            # Bypass the fact that try_files resets $fastcgi_path_info
-            # see: http://trac.nginx.org/nginx/ticket/321
-            set $path_info $fastcgi_path_info;
-            fastcgi_param PATH_INFO $path_info;
-
+            fastcgi_pass tt-rss-handler;
             fastcgi_index index.php;
             include fastcgi.conf;
-
-            fastcgi_pass tt-rss-handler;
         }
 
         location / {
-            try_files $uri $uri/ =404;
+            try_files $uri $uri/ /tt-rss/$uri /tt-rss/$uri/ =404;
         }
     }