From 87272296f06182a50f6a47e46bad6c350b762657 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Thu, 8 Aug 2019 11:31:14 -0400
Subject: [PATCH 1/5] Create freshrss.subfolder.conf.sample

---
 freshrss.subfolder.conf.sample | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 freshrss.subfolder.conf.sample

diff --git a/freshrss.subfolder.conf.sample b/freshrss.subfolder.conf.sample
new file mode 100644
index 0000000..a13613b
--- /dev/null
+++ b/freshrss.subfolder.conf.sample
@@ -0,0 +1,27 @@
+# freshrss does not have a base url setting
+
+location /freshrss {
+    return 301 $scheme://$host/ombi/;
+}
+
+location ^~ /freshrss/ {
+    # enable the next two lines for http auth
+    #auth_basic "Restricted";
+    #auth_basic_user_file /config/nginx/.htpasswd;
+
+    # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+    #auth_request /auth;
+    #error_page 401 =200 /login;
+
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_freshrss freshrss;
+    proxy_pass http://$upstream_freshrss:80;
+    
+    proxy_redirect off;
+    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;
+}

From 1e81091ab738c19d8df2f480ea50a908756007e3 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Thu, 8 Aug 2019 11:40:11 -0400
Subject: [PATCH 2/5] add rewrite

---
 freshrss.subfolder.conf.sample | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/freshrss.subfolder.conf.sample b/freshrss.subfolder.conf.sample
index a13613b..020eac5 100644
--- a/freshrss.subfolder.conf.sample
+++ b/freshrss.subfolder.conf.sample
@@ -1,7 +1,7 @@
 # freshrss does not have a base url setting
 
 location /freshrss {
-    return 301 $scheme://$host/ombi/;
+    return 301 $scheme://$host/freshrss/;
 }
 
 location ^~ /freshrss/ {
@@ -16,6 +16,7 @@ location ^~ /freshrss/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_freshrss freshrss;
+    rewrite /freshrss(.*) $1 break;
     proxy_pass http://$upstream_freshrss:80;
     
     proxy_redirect off;

From 12bd8f461230934a23a0299d3a2395f92615cb3c Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Thu, 8 Aug 2019 11:51:14 -0400
Subject: [PATCH 3/5] Create freshrss.subdomain.conf.sample

---
 freshrss.subdomain.conf.sample | 37 ++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 freshrss.subdomain.conf.sample

diff --git a/freshrss.subdomain.conf.sample b/freshrss.subdomain.conf.sample
new file mode 100644
index 0000000..2616898
--- /dev/null
+++ b/freshrss.subdomain.conf.sample
@@ -0,0 +1,37 @@
+# make sure that your dns has a cname set for freshrss
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name freshrss.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # enable the next two lines for ldap auth
+        #auth_request /auth;
+        #error_page 401 =200 /login;
+
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_freshrss freshrss;
+        proxy_pass http://$upstream_freshrss;
+        
+        proxy_redirect off;
+        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;
+    }
+}

From 57fe1d27258f22be0ad48afda323edcde6c4e1fe Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Sat, 10 Aug 2019 16:52:47 -0400
Subject: [PATCH 4/5] Update freshrss.subdomain.conf.sample

---
 freshrss.subdomain.conf.sample | 1 +
 1 file changed, 1 insertion(+)

diff --git a/freshrss.subdomain.conf.sample b/freshrss.subdomain.conf.sample
index 2616898..9ca07fc 100644
--- a/freshrss.subdomain.conf.sample
+++ b/freshrss.subdomain.conf.sample
@@ -29,6 +29,7 @@ server {
         
         proxy_redirect off;
         proxy_buffering off;
+        proxy_set_header Host $host;
         proxy_set_header X-Forwarded-Port $server_port;
         proxy_cookie_path / "/; HTTPOnly; Secure";
         proxy_set_header Authorization $http_authorization;

From 573aa00c17095541a11e53a56ff186430c9b7da8 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Sat, 10 Aug 2019 16:53:20 -0400
Subject: [PATCH 5/5] Update freshrss.subfolder.conf.sample

---
 freshrss.subfolder.conf.sample | 1 +
 1 file changed, 1 insertion(+)

diff --git a/freshrss.subfolder.conf.sample b/freshrss.subfolder.conf.sample
index 020eac5..ab46adc 100644
--- a/freshrss.subfolder.conf.sample
+++ b/freshrss.subfolder.conf.sample
@@ -21,6 +21,7 @@ location ^~ /freshrss/ {
     
     proxy_redirect off;
     proxy_buffering off;
+    proxy_set_header Host $host;
     proxy_set_header X-Forwarded-Port $server_port;
     proxy_cookie_path / "/; HTTPOnly; Secure";
     proxy_set_header Authorization $http_authorization;