Merge pull request #3 from Binnette/master

Install selfoss on a subfolder

check_process

@@ -5,7 +5,7 @@
 		is_public=1
 	; Checks
 		pkg_linter=1
-		setup_sub_dir=0
+		setup_sub_dir=1
 		setup_root=1
 		setup_nourl=0
 		setup_private=1

conf/nginx.conf

@@ -1,12 +1,25 @@
-location / {
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
+location __PATH__/ {
 
   # Path to source
   alias __FINALPATH__/;
 
-  index index.php;
+  # index.php is a router, it contains a lot of routes:
+  # / is serving the home page, /update is refreshing all feeds, etc.
+  # So we need to rewrite all URLs to give them to the router inside index.php
+  rewrite ^__PATH__/.*$ __PATH__/index.php?$args;
 
-  try_files $uri /public/$uri /index.php;
+  # feeds favicons and thumbnails are stored in subfolder data
+  location ~ ^__PATH__/((favicons|thumbnails)/.+)$ {
+    try_files __PATH__/data/$1 =404;
+  }
 
+  # statics assets are stored in public folder
+  location ~ ^__PATH__/(.*\.(js|ico|gif|jpg|png|css|map|asc|txt|svg|xml|webmanifest)).*$ {
+    try_files __PATH__/public/$1 =404;
+  }
+
+  # Regex to match PHP files
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
     fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
@@ -18,11 +31,6 @@ location / {
     fastcgi_param SCRIPT_FILENAME $request_filename;
   }
 
-  location ~ ^/(favicons|thumbnails)/.*$ {
+  # Include SSOWAT user panel.
-        try_files $uri /data/$uri;
+  include conf.d/yunohost_panel.conf.inc;
-    }
-
-  location ~* ^/(data\/logs|data\/sqlite|config\.ini|\.ht) {
-        deny all;
-    }
 }

manifest.json

@@ -34,6 +34,12 @@
                 "name": "domain",
                 "type": "domain"
             },
+            {
+                "name": "path",
+                "type": "path",
+                "example": "/selfoss",
+                "default": "/selfoss"
+            },
             {
                 "name": "is_public",
                 "type": "boolean",

scripts/install

@@ -21,7 +21,7 @@ ynh_abort_if_errors
 #=================================================
 
 domain=$YNH_APP_ARG_DOMAIN
-path_url="/"
+path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
 
 app=$YNH_APP_INSTANCE_NAME