From c72facd89e9bcac620dcabe8966b22599a0fbb93 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 12 Jul 2021 07:46:51 +0200
Subject: [PATCH] cleaning up

---
 manifest.json      |  2 +-
 scripts/change_url | 11 +----------
 scripts/upgrade    |  2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/manifest.json b/manifest.json
index 5cf1e13..637483b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Make your own classified advertising website easily",
         "fr": "Créer simplement et rapidement votre site de Petites Annonces"
     },
-    "version": "0.1.0~ynh3",
+    "version": "0.1.0~ynh4",
     "url": "https://framagit.org/toitoinebzh/petitesannonces",
     "upstream": {
         "license": "AGPL-3.0-or-later",
diff --git a/scripts/change_url b/scripts/change_url
index 039a977..27e120d 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -32,7 +32,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 # 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
+ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1
 
 # Backup the current version of the app
 ynh_backup_before_upgrade
@@ -91,15 +91,6 @@ then
 	ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
 fi
 
-#=================================================
-# GENERIC FINALISATION
-#=================================================
-# START SYSTEMD SERVICE
-#=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
-
-#ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
-
 #=================================================
 # RELOAD NGINX
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 9050a1a..1f7fff9 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -18,7 +18,6 @@ app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
-is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
@@ -43,6 +42,7 @@ ynh_clean_setup () {
 }
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
+
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================