From 4afacf9caa5e61155e84b75a6c849dc1c8716679 Mon Sep 17 00:00:00 2001
From: Dryusdan <contact@dryusdan.fr>
Date: Mon, 30 Oct 2017 12:39:58 +0100
Subject: [PATCH] move nginx conf folder

---
 freshrss/Dockerfile                                |  4 ----
 freshrss/rootfs/nginx/sites-enabled/nginx.conf     | 14 +++++++++-----
 .../{ => etc}/nginx/sites-enabled/peertube.conf    |  0
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename peertube/rootfs/{ => etc}/nginx/sites-enabled/peertube.conf (100%)

diff --git a/freshrss/Dockerfile b/freshrss/Dockerfile
index 007bd82..a652cb5 100644
--- a/freshrss/Dockerfile
+++ b/freshrss/Dockerfile
@@ -23,8 +23,4 @@ VOLUME /freshrss/data /php/session
 
 EXPOSE 8080
 
-LABEL maintainer="Wonderfall <wonderfall@targaryen.house>" \
-      description="A free, self-hostable aggregator" \
-      version="FreshRSS ${FRESHRSS_VER}"
-
 CMD ["run.sh"]
diff --git a/freshrss/rootfs/nginx/sites-enabled/nginx.conf b/freshrss/rootfs/nginx/sites-enabled/nginx.conf
index 7417ecd..b3d6b28 100644
--- a/freshrss/rootfs/nginx/sites-enabled/nginx.conf
+++ b/freshrss/rootfs/nginx/sites-enabled/nginx.conf
@@ -20,14 +20,18 @@ server {
             deny all;
         }
 
-        location / {
-	    try_files $uri $uri/ /index.php;
-        }
+         location / {
+ 		try_files $uri $uri/ index.php;
+ 	}
 
-	location ~ \.php$ {
+	location ~ ^.+?\.php(/.*)?$ {
             fastcgi_index index.php;
             fastcgi_pass unix:/php/run/php-fpm.sock;
+            fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            fastcgi_param PATH_INFO $fastcgi_path_info;
+            include fastcgi_params;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             include /nginx/conf/fastcgi_params;
-	}
+        }
+
 }
diff --git a/peertube/rootfs/nginx/sites-enabled/peertube.conf b/peertube/rootfs/etc/nginx/sites-enabled/peertube.conf
similarity index 100%
rename from peertube/rootfs/nginx/sites-enabled/peertube.conf
rename to peertube/rootfs/etc/nginx/sites-enabled/peertube.conf