From 73855697578a7c1f5ce372be26eac44f6adf1191 Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Fri, 25 Sep 2020 00:10:13 +0200
Subject: [PATCH] forget and delete variale

---
 conf/php-fpm.conf  | 2 +-
 manifest.json      | 2 +-
 scripts/_common.sh | 9 ++++++---
 scripts/backup     | 2 +-
 scripts/restore    | 4 ++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 0626fd8..3f4bc72 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -30,7 +30,7 @@ group = __USER__
 ;                            specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = /var/run/php/php$YNH_PHP_VERSION-fpm-__NAMETOCHANGE__.sock
+listen = /var/run/php/php7.0-fpm-__NAMETOCHANGE__.sock
 
 ; Set listen(2) backlog. A value of '-1' means unlimited.
 ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
diff --git a/manifest.json b/manifest.json
index 372d3f3..adb9921 100644
--- a/manifest.json
+++ b/manifest.json
@@ -19,7 +19,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php$YNH_PHP_VERSION-fpm"
+        "php7.0-fpm"
     ],
     "arguments": {
         "install" : [
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 9904210..b6eaf62 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -3,10 +3,13 @@
 #=================================================
 # COMMON VARIABLES
 #=================================================
-echo $(php -r "echo PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION;") = "phpversion"
-YNH_PHP_VERSION="phpversion"
 # dependencies used by the app
-pkg_dependencies="php$YNH_PHP_VERSION-sqlite3"
+if
+ynh_get_debian_release = "buster"; then
+pkg_dependencies="php7.3-sqlite3"
+else
+pkg_dependencies="php7.0-sqlite3"
+fi
 
 # ============= FUTURE YUNOHOST HELPER =============
 
diff --git a/scripts/backup b/scripts/backup
index 67b04de..e6dfc95 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -48,7 +48,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 ynh_script_progression --message="Backing up php-fpm configuration..."
 
-ynh_backup --src_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf"
+ynh_backup --src_path="/etc/php/7.0/fpm/pool.d/$app.conf"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/restore b/scripts/restore
index 0504490..199d043 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -83,7 +83,7 @@ ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 ynh_script_progression --message="Restore php-fpm configuration..." --weight=30
 
-ynh_restore_file --origin_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf"
+ynh_restore_file --origin_path="/etc/php/7.0/fpm/pool.d/$app.conf"
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
@@ -91,7 +91,7 @@ ynh_restore_file --origin_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf"
 #=================================================
 ynh_script_progression --message="Reloading nginx web server and php-fpm..." --weight=1
 
-ynh_systemd_action --service_name=php$YNH_PHP_VERSION-fpm --action=reload
+ynh_systemd_action --service_name=php7.0-fpm --action=reload
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================