From 49fd50ed91270815a418976bdaf66abd6403ac49 Mon Sep 17 00:00:00 2001
From: tituspijean <tituspijean@outlook.com>
Date: Sun, 15 Sep 2019 16:14:47 +0200
Subject: [PATCH 1/2] [fix] Remove php7.3-fpm service from requirements and add
 setting help

---
 manifest.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index a214327..ff9409a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -20,7 +20,6 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.3-fpm",
         "mysql"
     ],
     "arguments": {
@@ -74,6 +73,10 @@
                     "fr": "Est-ce une application publique ?",
                     "de": "Ist es eine öffentliche Applikation ?"
                 },
+                "help": {
+                    "en": "If public, it will be open to all visitors like any forum. If private, only the YunoHost server users can access it.",
+                    "fr": "Si public, le forum sera accessible à tous, comme pour tout forum. Si privé, seuls les utilisateurs du serveur YunoHost pourront y accéder."
+                },
                 "default": true
             },
             {

From d53fee45ab02f7aacce1e65fe43f5dd5e09ea80f Mon Sep 17 00:00:00 2001
From: tituspijean <tituspijean@outlook.com>
Date: Sun, 15 Sep 2019 16:15:09 +0200
Subject: [PATCH 2/2] [fix] path traversal and more_set_headers

---
 conf/nginx.conf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 7843482..d9446ee 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,4 +1,4 @@
-location ^~ __PATH__ {
+location ^~ __PATH__/ {
 
     if ($scheme = http) {
 		rewrite ^ https://$server_name$request_uri? permanent;
@@ -23,25 +23,25 @@ location ^~ __PATH__ {
 
     # Expire rules for static content
     location ~* \.(?:manifest|appcache|html?|xml|json)$ {
-      add_header Cache-Control "max-age=0";
+      more_set_headers "Cache-Control: max-age=0";
     }
 
     location ~* \.(?:rss|atom)$ {
-      add_header Cache-Control "max-age=3600";
+      more_set_headers "Cache-Control: max-age=3600";
     }
 
     location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|mp4|ogg|ogv|webm|htc)$ {
-      add_header Cache-Control "max-age=2592000";
+      more_set_headers "Cache-Control: max-age=2592000";
       access_log off;
     }
 
     location ~* \.(?:css|js)$ {
-      add_header Cache-Control "max-age=31536000";
+      more_set_headers "Cache-Control: max-age=31536000";
       access_log off;
     }
 
     location ~* \.(?:ttf|ttc|otf|eot|woff|woff2)$ {
-      add_header Cache-Control "max-age=2592000";
+      more_set_headers "Cache-Control: max-age=2592000";
       access_log off;
     }