From ebbae37f009e3cd2d8a62f15ac2364ea47dce542 Mon Sep 17 00:00:00 2001
From: frju365 <abld@abld.info>
Date: Wed, 17 Jun 2020 20:06:46 +0200
Subject: [PATCH] Subpath and different corrections

---
 conf/nginx.conf    | 45 ++++++++++++++++++++++-----------------------
 scripts/change_url | 34 ++++++++++++++++++++++------------
 2 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 8328b41..bb48715 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,27 +1,26 @@
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__ {
 
-# Path to source
-alias __FINALPATH__/www/ ;
+    # Path to source
+    alias __FINALPATH__/www/ ;
 
-if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
+    if ($scheme = http) {
+        rewrite ^ https://$server_name$request_uri? permanent;
+    }
+
+    index index.php /_route.php;
+    try_files $uri $uri/ index.php /_route.php;
+
+    location ~ [^/]\.php(/|$) {
+      fastcgi_split_path_info ^(.+?\.php)(/.*)$;
+      fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock;
+      fastcgi_index index.php;
+      include fastcgi_params;
+      fastcgi_param REMOTE_USER $remote_user;
+      fastcgi_param PATH_INFO $fastcgi_path_info;
+      fastcgi_param SCRIPT_FILENAME $request_filename;
+    }
+
+    # Include SSOWAT user panel.
+    include conf.d/yunohost_panel.conf.inc;
 }
-
- # Example PHP configuration (remove if not used)
-  index index.php /_route.php;
-  try_files $uri $uri/ index.php /_route.php;
-
-location ~ [^/]\.php(/|$) {
-  fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-  fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock;
-  fastcgi_index index.php;
-  include fastcgi_params;
-  fastcgi_param REMOTE_USER $remote_user;
-  fastcgi_param PATH_INFO $fastcgi_path_info;
-  fastcgi_param SCRIPT_FILENAME $request_filename;
-}
-  # PHP configuration end
-
-  # Include SSOWAT user panel.
-  include conf.d/yunohost_panel.conf.inc;
-}
\ No newline at end of file
diff --git a/scripts/change_url b/scripts/change_url
index 7244972..dfd11fe 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -29,27 +29,37 @@ ynh_script_progression --message="Loading installation settings..." --time --wei
 # Needed for helper "ynh_add_nginx_config"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
-# #=================================================
-# # CHECK THE SYNTAX OF THE PATHS
-# #=================================================
+#=================================================
+# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+#=================================================
+ynh_script_progression --message="Backing up the app before changing its url (may take a while)..." --time --weight=1
 
-# test -n "$old_path" || old_path="/"
-# test -n "$new_path" || new_path="/"
-# new_path=$(ynh_normalize_url_path $new_path)
-# old_path=$(ynh_normalize_url_path $old_path)
+# Backup the current version of the app
+ynh_backup_before_upgrade
+ynh_clean_setup () {
+	# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
+	ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
+
+	# restore it if the upgrade fails
+	ynh_restore_upgradebackup
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
 
 #=================================================
 # CHECK WHICH PARTS SHOULD BE CHANGED
 #=================================================
 
 change_domain=0
-if [ "$old_domain" != "$new_domain" ]; then
-  change_domain=1
+if [ "$old_domain" != "$new_domain" ]
+then
+	change_domain=1
 fi
 
 change_path=0
-if [ "$old_path" != "$new_path" ]; then
-  change_path=1
+if [ "$old_path" != "$new_path" ]
+then
+	change_path=1
 fi
 
 #=================================================
@@ -107,4 +117,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Change of URL completed for $app" --time --last
\ No newline at end of file
+ynh_script_progression --message="Change of URL completed for $app" --time --last