From 16f3f2b4e501cae71e2845fd6ca215b05ed118ae Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Thu, 30 Jul 2020 14:33:11 +0200
Subject: [PATCH] update garradin version and add protected uris in nginx.conf

---
 conf/app.src    |  4 ++--
 conf/nginx.conf | 22 ++++++++++++++--------
 manifest.json   |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 793816f..a24c59a 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-0.9.6.tar.bz2
-SOURCE_SUM=a0c4dcc6adc25a6f093bc09b0ed4c7efcbfde0726b790431c293112800ccc282
+SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-0.9.8.tar.bz2
+SOURCE_SUM=98aa01b86521ff66dcc951ab6f0eb1915e3cee5dada15ba20c96ab72512f1e83
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.bz2
 SOURCE_IN_SUBDIR=true
diff --git a/conf/nginx.conf b/conf/nginx.conf
index efd6ba0..cf253bc 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,13 +1,13 @@
-#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__ {
-  
-  # Path to source
-  alias __FINALPATH__/www/ ;
 
-  if ($scheme = http) {
+# Path to source
+alias __FINALPATH__/www/ ;
+
+if ($scheme = http) {
     rewrite ^ https://$server_name$request_uri? permanent;
   }
-
+  
+  # Protecting sensibles urls
   location ~ 403 {
     rewrite ^(.*)$ /include/ redirect;
     rewrite ^(.*)$ /cache/ redirect;
@@ -19,13 +19,17 @@ location __PATH__ {
     rewrite ^(.*)$ /config\.(.*)\.php redirect;
     }
 
-  try_files $uri $uri/ index.php /_route.php;
+  # Example PHP configuration (remove if not used)
+  location __PATH__/ {
   index index.php /_route.php;
+  try_files $uri $uri/ index.php /_route.php;
+  }
 
   location ~ [^/]\.php(/|$) {
+    try_files $uri $uri/ /_route.php;
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
     fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock;
-    fastcgi_index index.php;
+    # fastcgi_index index.php;
     include fastcgi_params;
     fastcgi_param REMOTE_USER $remote_user;
     fastcgi_param PATH_INFO $fastcgi_path_info;
@@ -35,6 +39,8 @@ location __PATH__ {
   # Increase size limit
   client_max_body_size 2M;
 
+  # PHP configuration end
+
   # Include SSOWAT user panel.
   include conf.d/yunohost_panel.conf.inc;
 }
diff --git a/manifest.json b/manifest.json
index 6a94ac3..58e2823 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,7 +10,7 @@
         "fr": "Logiciel libre de gestion d'association"
     },
 
-     "version": "0.9.6~ynh3",
+     "version": "0.9.8~ynh3",
 
     "url": "http://garradin.eu/a-propos/",
     "license": "GPL-3.0-or-later",