Depend on YNH 2.7.2, remove helpers, minor changes

manifest.json

@@ -7,7 +7,7 @@
         "fr": "Serveur CalDAV+CardDAV léger"
     },
     "url": "http://baikal-server.com/",
-    "license": "GPL-3",
+    "license": "GPL-3.0",
     "version": "0.4.6",
     "maintainer": {
         "name": "julien",
@@ -20,7 +20,7 @@
         "mysql"
     ],
     "requirements": {
-        "yunohost": ">= 2.6.4"
+        "yunohost": ">= 2.7.2"
     },
     "arguments": {
         "install" : [

scripts/_common.sh

@@ -1,152 +0,0 @@
-
-
-# =============================================================================
-# COMMON VARIABLES
-# =============================================================================
-
-# App package root directory should be the parent folder
-# PKGDIR=$(cd ../; pwd)
-
-# =============================================================================
-#                     YUNOHOST 2.7 FORTHCOMING HELPERS
-# =============================================================================
-
-# Create a dedicated nginx config
-#
-# This will use a template in ../conf/nginx.conf
-#   __PATH__      by  $path_url
-#   __DOMAIN__    by  $domain
-#   __PORT__      by  $port
-#   __NAME__      by  $app
-#   __FINALPATH__ by  $final_path
-#
-# usage: ynh_add_nginx_config
-ynh_add_nginx_config () {
-	finalnginxconf="/etc/nginx/conf.d/$domain.d/$app.conf"
-	ynh_backup_if_checksum_is_different "$finalnginxconf"
-	sudo cp ../conf/nginx.conf "$finalnginxconf"
-
-	# To avoid a break by set -u, use a void substitution ${var:-}. If the variable is not set, it's simply set with an empty variable.
-	# Substitute in a nginx config file only if the variable is not empty
-	if test -n "${path_url:-}"; then
-		ynh_replace_string "__PATH__" "$path_url" "$finalnginxconf"
-	fi
-	if test -n "${domain:-}"; then
-		ynh_replace_string "__DOMAIN__" "$domain" "$finalnginxconf"
-	fi
-	if test -n "${port:-}"; then
-		ynh_replace_string "__PORT__" "$port" "$finalnginxconf"
-	fi
-	if test -n "${app:-}"; then
-		ynh_replace_string "__NAME__" "$app" "$finalnginxconf"
-	fi
-	if test -n "${final_path:-}"; then
-		ynh_replace_string "__FINALPATH__" "$final_path" "$finalnginxconf"
-	fi
-	ynh_store_file_checksum "$finalnginxconf"
-
-	sudo systemctl reload nginx
-}
-
-# Remove the dedicated nginx config
-#
-# usage: ynh_remove_nginx_config
-ynh_remove_nginx_config () {
-	ynh_secure_remove "/etc/nginx/conf.d/$domain.d/$app.conf"
-	sudo systemctl reload nginx
-}
-
-# Create a dedicated php-fpm config
-#
-# usage: ynh_add_fpm_config
-ynh_add_fpm_config () {
-	finalphpconf="/etc/php5/fpm/pool.d/$app.conf"
-	ynh_backup_if_checksum_is_different "$finalphpconf"
-	sudo cp ../conf/php-fpm.conf "$finalphpconf"
-	ynh_replace_string "__NAMETOCHANGE__" "$app" "$finalphpconf"
-	ynh_replace_string "__FINALPATH__" "$final_path" "$finalphpconf"
-	ynh_replace_string "__USER__" "$app" "$finalphpconf"
-	sudo chown root: "$finalphpconf"
-	ynh_store_file_checksum "$finalphpconf"
-
-	if [ -e "../conf/php-fpm.ini" ]
-	then
-		finalphpini="/etc/php5/fpm/conf.d/20-$app.ini"
-		ynh_backup_if_checksum_is_different "$finalphpini"
-		sudo cp ../conf/php-fpm.ini "$finalphpini"
-		sudo chown root: "$finalphpini"
-		ynh_store_file_checksum "$finalphpini"
-	fi
-
-	sudo systemctl reload php5-fpm
-}
-
-# Remove the dedicated php-fpm config
-#
-# usage: ynh_remove_fpm_config
-ynh_remove_fpm_config () {
-	ynh_secure_remove "/etc/php5/fpm/pool.d/$app.conf"
-	ynh_secure_remove "/etc/php5/fpm/conf.d/20-$app.ini" 2>&1
-	sudo systemctl reload php5-fpm
-}
-
-# Restore a previous backup if the upgrade process failed
-#
-# usage:
-# ynh_backup_before_upgrade
-# ynh_clean_setup () {
-# 	ynh_restore_upgradebackup
-# }
-# ynh_abort_if_errors
-#
-ynh_restore_upgradebackup () {
-	echo "Upgrade failed." >&2
-	app_bck=${app//_/-}	# Replace all '_' by '-'
-	
-        # Check if an existing backup can be found before removing and restoring the application.
-	if sudo yunohost backup list | grep -q $app_bck-pre-upgrade$backup_number
-    	then
-		# Remove the application then restore it
-		sudo yunohost app remove $app
-		# Restore the backup
-		sudo yunohost backup restore --ignore-system $app_bck-pre-upgrade$backup_number --apps $app --force
-		ynh_die "The app was restored to the way it was before the failed upgrade."
-	fi
-}
-
-# Make a backup in case of failed upgrade
-#
-# usage:
-# ynh_backup_before_upgrade
-# ynh_clean_setup () {
-# 	ynh_restore_upgradebackup
-# }
-# ynh_abort_if_errors
-#
-ynh_backup_before_upgrade () {
-	backup_number=1
-	old_backup_number=2
-	app_bck=${app//_/-}	# Replace all '_' by '-'
-	
-    	# Check if a backup already exists with the prefix 1
-	if sudo yunohost backup list | grep -q $app_bck-pre-upgrade1
-    	then
-        	# Prefix becomes 2 to preserve the previous backup
-		backup_number=2
-		old_backup_number=1
-	fi
-
-	# Create backup
-	sudo yunohost backup create --ignore-system --apps $app --name $app_bck-pre-upgrade$backup_number
-	if [ "$?" -eq 0 ]
-    	then
-		# If the backup succeeded, remove the previous backup
-		if sudo yunohost backup list | grep -q $app_bck-pre-upgrade$old_backup_number
-		then
-			# Remove the previous backup only if it exists
-			sudo yunohost backup delete $app_bck-pre-upgrade$old_backup_number > /dev/null
-		fi
-	else
-		ynh_die "Backup failed, the upgrade process was aborted."
-	fi
-}

scripts/backup

@@ -13,12 +13,12 @@ set -eu
 # IMPORT GENERIC HELPERS
 #=================================================
 
-if [ ! -e _common.sh ]; then
+#if [ ! -e _common.sh ]; then
-	# Get the _common.sh file if it's not in the current directory
+#	# Get the _common.sh file if it's not in the current directory
-	cp ../settings/scripts/_common.sh ./_common.sh
+#	cp ../settings/scripts/_common.sh ./_common.sh
-	chmod a+rx _common.sh
+#	chmod a+rx _common.sh
-fi
+#fi
-source _common.sh
+#source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -38,19 +38,19 @@ db_pwd=$(ynh_app_setting_get $app mysqlpwd)
 # BACKUP THE APP MAIN DIR
 #=================================================
 
-ynh_backup "$final_path" "${YNH_APP_BACKUP_DIR}$final_path"
+ynh_backup "$final_path"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION
 #=================================================
 
-ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" "${YNH_APP_BACKUP_DIR}/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # BACKUP THE PHP-FPM CONFIGURATION
 #=================================================
 
-ynh_backup "/etc/php5/fpm/pool.d/$app.conf" "${YNH_APP_BACKUP_DIR}/etc/php5/fpm/pool.d/$app.conf"
+ynh_backup "/etc/php5/fpm/pool.d/$app.conf"
 
 #=================================================
 # BACKUP THE MYSQL DATABASE

scripts/install

@@ -6,7 +6,7 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-source ./_common.sh
+#source ./_common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -114,7 +114,7 @@ ynh_store_file_checksum "$bk_conf"
 
 bk_conf="${final_path}/Specific/config.system.php"
 cp ../conf/config.system.php "$bk_conf"
-ynh_replace_string "#PATH#" "$path_url"     "$bk_conf"
+ynh_replace_string "#PATH#" "$path_url" "$bk_conf"
 ynh_replace_string "#DBNAME#" "$db_name" "$bk_conf"
 ynh_replace_string "#DBUSER#" "$db_name" "$bk_conf"
 ynh_replace_string "#DBPASS#" "$db_pwd" "$bk_conf"

scripts/remove

@@ -6,13 +6,13 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-if [ ! -e _common.sh ]; then
+#if [ ! -e _common.sh ]; then
-	# Get file fonction if not been to the current directory
+#	# Get file fonction if not been to the current directory
-	sudo cp ../settings/scripts/_common.sh ./_common.sh
+#	sudo cp ../settings/scripts/_common.sh ./_common.sh
-	sudo chmod a+rx _common.sh
+#	sudo chmod a+rx _common.sh
-fi
+#fi
 # Source app helpers
-source _common.sh
+#source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================

scripts/restore

@@ -13,12 +13,12 @@ set -eu
 # IMPORT GENERIC HELPERS
 #=================================================
 
-if [ ! -e _common.sh ]; then
+#if [ ! -e _common.sh ]; then
-	# Get the _common.sh file if it's not in the current directory
+#	# Get the _common.sh file if it's not in the current directory
-	cp ../settings/scripts/_common.sh ./_common.sh
+#	cp ../settings/scripts/_common.sh ./_common.sh
-	chmod a+rx _common.sh
+#	chmod a+rx _common.sh
-fi
+#fi
-source _common.sh
+#source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================

scripts/upgrade

@@ -6,7 +6,7 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-source _common.sh
+#source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -117,7 +117,7 @@ bk_conf="${final_path}/Specific/config.system.php"
 ynh_backup_if_checksum_is_different "$bk_conf"
 cp ../conf/config.system.php "$bk_conf"
 
-ynh_replace_string "#PATH#" "$path_url"     "$bk_conf"
+ynh_replace_string "#PATH#" "$path_url" "$bk_conf"
 ynh_replace_string "#DBNAME#" "$db_name" "$bk_conf"
 ynh_replace_string "#DBUSER#" "$db_name" "$bk_conf"
 db_pwd=$(ynh_app_setting_get $app mysqlpwd)