Merge pull request #19 from YunoHost-Apps/code_refactoring

Reprise globale du package

README.md

@@ -1,7 +1,10 @@
 # Wordpress multisite for YunoHost
 ==================
+
 Site du project Yunohost : [Yunohost.org](https://yunohost.org/#/)
 
+=======
+
 ## English version
 Wordpress lets you create your blog or web site very easily. <br/>
 With this package, you can even activate the [multisite](http://codex.wordpress.org/Glossary#Multisite)
@@ -30,3 +33,7 @@ Si l'option multisite est activée, le script installe le paquet *php5-cli*.
 3) Il peut également y avoir des mises à jour du paquet wordpress_ynh, celles-ci sont liées à l'intégration du paquet dans le systeme Yunohost.
 
 **Multi-utilisateur:** Oui, avec support ldap.
+
+**Voir l'état du package:**  
+*[Dernier rapport hebdomadaire](https://forum.yunohost.org/t/rapport-hebdomadaire-dintegration-continue/2297)*  
+*[Dernier test d'intégration continue](https://ci-apps.yunohost.org/jenkins/job/wordpress%20%28Official%29/lastBuild/consoleFull)*

check_process

@@ -5,8 +5,8 @@
 		path="/path"	(PATH)
 		admin="john"	(USER)
 		language="fr_FR"
-		multisite="No"
+		multisite=0
-		is_public="Yes"	(PUBLIC|public=Yes|private=No)
+		is_public=1	(PUBLIC|public=1|private=0)
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@@ -17,13 +17,9 @@
 		upgrade=1
 		backup_restore=1
 		multi_instance=1
-		wrong_user=1
-		wrong_path=1
 		incorrect_path=1
-		corrupt_source=0
-		fail_download_source=0
 		port_already_use=0
-		final_path_already_use=0
+		change_url=0
 ;; Test avec multisite
 	auto_remove=1
 	; Manifest
@@ -31,8 +27,8 @@
 		path="/path"	(PATH)
 		admin="john"	(USER)
 		language="fr_FR"
-		multisite="Yes"
+		multisite=1
-		is_public="Yes"	(PUBLIC|public=Yes|private=No)
+		is_public=1	(PUBLIC|public=1|private=0)
 	; Checks
 		setup_sub_dir=1
 		setup_root=0
@@ -42,21 +38,22 @@
 		upgrade=1
 		backup_restore=1
 		multi_instance=1
-		wrong_user=0
-		wrong_path=0
 		incorrect_path=0
-		corrupt_source=0
-		fail_download_source=0
 		port_already_use=0
-		final_path_already_use=0
+		change_url=0
 ;;; Levels
 	Level 1=auto
 	Level 2=auto
 	Level 3=auto
+# Level 4: https://github.com/YunoHost-Apps/wordpress_ynh/blob/master/conf/sql/single.sql#L1
 	Level 4=1
+# Level 5: https://github.com/YunoHost-Apps/wordpress_ynh/issues/18
 	Level 5=1
 	Level 6=auto
 	Level 7=auto
 	Level 8=0
 	Level 9=0
 	Level 10=0
+;;; Options
+Email=
+Notification=down

conf/app.src

@@ -0,0 +1,6 @@
+SOURCE_URL=https://wordpress.org/wordpress-4.7.2.tar.gz
+SOURCE_SUM=17f9fe2fa6d14eba86aad152059b5afd
+SOURCE_SUM_PRG=md5sum
+ARCH_FORMAT=tar.gz
+SOURCE_IN_SUBDIR=true
+SOURCE_FILENAME=

conf/nginx.conf

@@ -1,15 +1,15 @@
 #--MULTISITE--if (!-e $request_filename) {
 	#--MULTISITE--rewrite /wp-admin$ $scheme://$host$uri/ permanent;
-	#--MULTISITE--rewrite ^__PATHTOCHANGE__(/[^/]+)?(/wp-.*) __PATHTOCHANGE__$2 last;
+	#--MULTISITE--rewrite ^__PATH__(/[^/]+)?(/wp-.*) __PATH__$2 last;
-	#--MULTISITE--rewrite ^__PATHTOCHANGE__(/[^/]+)?(/.*\.php)$ __PATHTOCHANGE__$2 last;
+	#--MULTISITE--rewrite ^__PATH__(/[^/]+)?(/.*\.php)$ __PATH__$2 last;
 #--MULTISITE--}
 
-location __PATHTOCHANGE__ {
+location __PATH__ {
        alias __FINALPATH__/;
        index index.php;
        if (!-e $request_filename)
        {
-              rewrite ^(.+)$ __PATHTOCHANGE__/index.php?q=$1 last;
+              rewrite ^(.+)$ __PATH__/index.php?q=$1 last;
        }
        if ($scheme = http) {
              rewrite ^ https://$server_name$request_uri? permanent;
@@ -17,7 +17,7 @@ location __PATHTOCHANGE__ {
        client_max_body_size 30m;
        location ~ [^/]\.php(/|$) {
            fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-           fastcgi_pass unix:/var/run/php5-fpm-__NAMETOCHANGE__.sock;
+           fastcgi_pass unix:/var/run/php5-fpm-__NAME__.sock;
            fastcgi_index index.php;
            include fastcgi_params;
            fastcgi_param REMOTE_USER $remote_user;

conf/php-fpm.conf

@@ -19,8 +19,8 @@
 ; Unix user/group of processes
 ; Note: The user is mandatory. If the group is not set, the default user's group
 ;       will be used.
-user = www-data
+user = __USER__
-group = www-data
+group = __USER__
 
 ; The address on which to accept FastCGI requests.
 ; Valid syntaxes are:

manifest.json

@@ -9,9 +9,9 @@
 		"en": "Create a beautiful blog or website easily",
 		"fr": "Logiciel de création de blog ou de site Web"
 	},
-	"version": "4.5.2",
+	"version": "4.7.2",
 	"url": "https://wordpress.org/",
-	"license": "free",
+	"license": "GPLv2",
 	"maintainer": {
 		"name": "Maniack Crudelis",
 		"email": "maniackc_dev@crudelis.fr"
@@ -63,21 +63,21 @@
 			},
 			{
 				"name": "multisite",
+				"type": "boolean",
 				"ask": {
 					"en": "Enable multisite option ?",
 					"fr": "Activer l'option multisite ?"
 				},
-				"choices": ["Yes", "No"],
+				"default": false
-				"default": "No"
 			},
 			{
 				"name": "is_public",
+				"type": "boolean",
 				"ask": {
 					"en": "Is it a public WordPress site ?",
 					"fr": "Est-ce un site public ?"
 				},
-				"choices": ["Yes", "No"],
+				"default": true
-				"default": "Yes"
 			}
 		]
 	}

scripts/.fonctions

@@ -1,213 +0,0 @@
-#!/bin/bash
-
-CHECK_VAR () {	# Vérifie que la variable n'est pas vide.
-# $1 = Variable à vérifier
-# $2 = Texte à afficher en cas d'erreur
-	test -n "$1" || (echo "$2" >&2 && false)
-}
-
-EXIT_PROPERLY () {	# Provoque l'arrêt du script en cas d'erreur. Et nettoye les résidus.
-	exit_code=$?
-	if [ "$exit_code" -eq 0 ]; then
-			exit 0	# Quitte sans erreur si le script se termine correctement.
-	fi
-	trap '' EXIT
-	set +eu
-	echo -e "\e[91m \e[1m"	# Shell in light red bold
-	echo -e "!!\n  $app install's script has encountered an error. Installation was cancelled.\n!!" >&2
-
-	if type -t CLEAN_SETUP > /dev/null; then	# Vérifie l'existance de la fonction avant de l'exécuter.
-		CLEAN_SETUP	# Appel la fonction de nettoyage spécifique du script install.
-	fi
-
-	# Compense le bug de ssowat qui ne supprime pas l'entrée de l'app en cas d'erreur d'installation.
-	sudo sed -i "\@\"$domain$path/\":@d" /etc/ssowat/conf.json
-
-	ynh_die
-}
-
-TRAP_ON () {	# Activate signal capture
-	set -eu	# Exit if a command fail, and if a variable is used unset.
-	trap EXIT_PROPERLY EXIT	# Capturing exit signals on shell script
-}
-
-CHECK_USER () {	# Vérifie la validité de l'user admin
-# $1 = Variable de l'user admin.
-	ynh_user_exists "$1" || (echo "Wrong admin" >&2 && false)
-}
-
-CHECK_PATH () {	# Vérifie la présence du / en début de path. Et son absence à la fin.
-	if [ "${path:0:1}" != "/" ]; then    # Si le premier caractère n'est pas un /
-		path="/$path"    # Ajoute un / en début de path
-	fi
-	if [ "${path:${#path}-1}" == "/" ] && [ ${#path} -gt 1 ]; then    # Si le dernier caractère est un / et que ce n'est pas le seul caractère.
-		path="${path:0:${#path}-1}"	# Supprime le dernier caractère
-	fi
-}
-
-CHECK_DOMAINPATH () {	# Vérifie la disponibilité du path et du domaine.
-	sudo yunohost app checkurl $domain$path -a $app
-}
-
-CHECK_FINALPATH () {	# Vérifie que le dossier de destination n'est pas déjà utilisé.
-	final_path=/var/www/$app
-	if [ -e "$final_path" ]
-	then
-		echo "This path already contains a folder" >&2
-		false
-	fi
-}
-
-GENERATE_DB () {	# Créer une base de données et un utilisateur dédié au nom de l'app.
-# $1 = Nom de la base de donnée
-	db_user=$1
-	db_user=${db_user//-/_}	# mariadb ne supporte pas les - dans les noms de base de données. Ils sont donc remplacé par des _
-	# Génère un mot de passe aléatoire.
-# 	db_pwd=$(head -n20 /dev/urandom | tr -c -d 'A-Za-z0-9' | head -c20)
-	db_pwd=$(ynh_string_random)
-	CHECK_VAR "$db_pwd" "db_pwd empty"
-	# Utilise '$app' comme nom d'utilisateur et de base de donnée
-	# Initialise la base de donnée et stocke le mot de passe mysql.
-	ynh_mysql_create_db "$db_user" "$db_user" $db_pwd
-	ynh_app_setting_set $app mysqlpwd $db_pwd
-}
-
-SETUP_SOURCE () {	# Télécharge la source, décompresse et copie dans $final_path
-# $1 = Nom de l'archive téléchargée.
-	wget -nv -i ../sources/source_url -O $1
-	# Vérifie la somme de contrôle de la source téléchargée.
-	md5sum -c ../sources/source_md5 --status || (echo "Corrupt source" >&2 && false)
-	# Décompresse la source
-	if [ "$(echo ${1##*.})" == "gz" ]; then
-		tar -x -f $1
-	elif [ "$(echo ${1##*.})" == "zip" ]; then
-		unzip -q $1
-	else
-		false	# Format d'archive non pris en charge.
-	fi
-	# Copie les fichiers sources
-	sudo cp -a $(cat ../sources/source_dir)/. "$final_path"
-	# Copie les fichiers additionnels ou modifiés.
-	if test -e "../sources/ajouts"; then
-		sudo cp -a ../sources/ajouts/. "$final_path"
-	fi
-}
-
-ADD_SYS_USER () {   # Créer un utilisateur système dédié à l'app
-        if ! ynh_system_user_exists "$app"	# Test l'existence de l'utilisateur
-        then
-            sudo useradd -d /var/www/$app --system --user-group $app --shell /usr/sbin/nologin || (echo "Unable to create $app system account" >&2 && false)
-        fi
-}
-
-POOL_FPM () {	# Créer le fichier de configuration du pool php-fpm et le configure.
-	sed -i "s@__NAMETOCHANGE__@$app@g" ../conf/php-fpm.conf
-	sed -i "s@__FINALPATH__@$final_path@g" ../conf/php-fpm.conf
-	sed -i "s@__USER__@$app@g" ../conf/php-fpm.conf
-	finalphpconf=/etc/php5/fpm/pool.d/$app.conf
-	sudo cp ../conf/php-fpm.conf $finalphpconf
-	sudo chown root: $finalphpconf
-	finalphpini=/etc/php5/fpm/conf.d/20-$app.ini
-	sudo cp ../conf/php-fpm.ini $finalphpini
-	sudo chown root: $finalphpini
-	sudo service php5-fpm reload
-}
-
-STORE_MD5_CONFIG () {	# Enregistre la somme de contrôle du fichier de config
-# $1 = Nom du fichier de conf pour le stockage dans settings.yml
-# $2 = Nom complet et chemin du fichier de conf.
-	ynh_app_setting_set $app $1_file_md5 $(sudo md5sum "$2" | cut -d' ' -f1)
-}
-
-CHECK_MD5_CONFIG () {	# Créé un backup du fichier de config si il a été modifié.
-# $1 = Nom du fichier de conf pour le stockage dans settings.yml
-# $2 = Nom complet et chemin du fichier de conf.
-	if [ "$(ynh_app_setting_get $app $1_file_md5)" != $(sudo md5sum "$2" | cut -d' ' -f1) ]; then
-		sudo cp -a "$2" "$2.backup.$(date '+%d.%m.%y_%Hh%M,%Ss')"	# Si le fichier de config a été modifié, créer un backup.
-	fi
-}
-
-FIND_PORT () {	# Cherche un port libre.
-# $1 = Numéro de port pour débuter la recherche.
-	port=$1
-	while ! sudo yunohost app checkport $port ; do
-		port=$((port+1))
-	done
-	CHECK_VAR "$port" "port empty"
-}
-
-
-### REMOVE SCRIPT
-
-REMOVE_NGINX_CONF () {	# Suppression de la configuration nginx
-	if [ -e "/etc/nginx/conf.d/$domain.d/$app.conf" ]; then	# Delete nginx config
-		echo "Delete nginx config"
-		sudo rm "/etc/nginx/conf.d/$domain.d/$app.conf"
-		sudo service nginx reload
-	fi
-}
-
-REMOVE_FPM_CONF () {	# Suppression de la configuration du pool php-fpm
-	if [ -e "/etc/php5/fpm/pool.d/$app.conf" ]; then	# Delete fpm config
-		echo "Delete fpm config"
-		sudo rm "/etc/php5/fpm/pool.d/$app.conf"
-	fi
-	if [ -e "/etc/php5/fpm/conf.d/20-$app.ini" ]; then	# Delete php config
-		echo "Delete php config"
-		sudo rm "/etc/php5/fpm/conf.d/20-$app.ini"
-	fi
-	sudo service php5-fpm reload
-}
-
-REMOVE_LOGROTATE_CONF () {	# Suppression de la configuration de logrotate
-	if [ -e "/etc/logrotate.d/$app" ]; then
-		echo "Delete logrotate config"
-		sudo rm "/etc/logrotate.d/$app"
-	fi
-}
-
-SECURE_REMOVE () {      # Suppression de dossier avec vérification des variables
-	chaine="$1"	# L'argument doit être donné entre quotes simple '', pour éviter d'interpréter les variables.
-	no_var=0
-	while (echo "$chaine" | grep -q '\$')	# Boucle tant qu'il y a des $ dans la chaine
-	do
-		no_var=1
-		global_var=$(echo "$chaine" | cut -d '$' -f 2)	# Isole la première variable trouvée.
-		only_var=\$$(expr "$global_var" : '\([A-Za-z0-9_]*\)')	# Isole complètement la variable en ajoutant le $ au début et en gardant uniquement le nom de la variable. Se débarrasse surtout du / et d'un éventuel chemin derrière.
-		real_var=$(eval "echo ${only_var}")		# `eval "echo ${var}` permet d'interpréter une variable contenue dans une variable.
-		if test -z "$real_var" || [ "$real_var" = "/" ]; then
-			echo "Variable $only_var is empty, suppression of $chaine cancelled." >&2
-			return 1
-		fi
-		chaine=$(echo "$chaine" | sed "s@$only_var@$real_var@")	# remplace la variable par sa valeur dans la chaine.
-	done
-	if [ "$no_var" -eq 1 ]
-	then
-		if [ -e "$chaine" ]; then
-			echo "Delete directory $chaine"
-			sudo rm -r "$chaine"
-		fi
-		return 0
-	else
-		echo "No detected variable." >&2
-		return 1
-	fi
-}
-
-REMOVE_BDD () {	# Suppression de la base de donnée et de l'utilisateur associé.
-# $1 = Nom de la base de donnée
-	# Utilise '$app' comme nom d'utilisateur et de base de donnée
-	db_user=$1
-	if mysqlshow -u root -p$(sudo cat $MYSQL_ROOT_PWD_FILE) | grep -q "^| $db_user"; then
-		echo "Delete db"
-		ynh_mysql_drop_db $db_user
-		ynh_mysql_drop_user $db_user
-	fi
-}
-
-REMOVE_SYS_USER () {   # Supprime l'utilisateur système dédié à l'app
-    if ynh_system_user_exists "$app"	# Test l'existence de l'utilisateur
-    then
-    	sudo userdel $app
-    fi
-}

scripts/_common.sh

@@ -0,0 +1,850 @@
+#!/bin/bash
+
+#=================================================
+#=================================================
+# TESTING
+#=================================================
+#=================================================
+
+ynh_fpm_config () {
+	finalphpconf="/etc/php5/fpm/pool.d/$app.conf"
+	ynh_backup_if_checksum_is_different "$finalphpconf" 1
+	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" 1
+		sudo cp ../conf/php-fpm.ini "$finalphpini"
+		sudo chown root: "$finalphpini"
+		ynh_store_file_checksum "$finalphpini"
+	fi
+
+	sudo systemctl reload php5-fpm
+}
+
+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"
+	sudo systemctl reload php5-fpm
+}
+
+ynh_nginx_config () {
+	finalnginxconf="/etc/nginx/conf.d/$domain.d/$app.conf"
+	ynh_backup_if_checksum_is_different "$finalnginxconf" 1
+	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
+}
+
+ynh_remove_nginx_config () {
+	ynh_secure_remove "/etc/nginx/conf.d/$domain.d/$app.conf"
+	sudo systemctl reload nginx
+}
+
+ynh_systemd_config () {
+	finalsystemdconf="/etc/systemd/system/$app.service"
+	ynh_backup_if_checksum_is_different "$finalsystemdconf" 1
+	sudo cp ../conf/systemd.service "$finalsystemdconf"
+
+	# 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 "${final_path:-}"; then
+		ynh_replace_string "__FINALPATH__" "$final_path" "$finalsystemdconf"
+	fi
+	if test -n "${app:-}"; then
+		ynh_replace_string "__APP__" "$app" "$finalsystemdconf"
+	fi
+	ynh_store_file_checksum "$finalsystemdconf"
+
+	sudo chown root: "$finalsystemdconf"
+	sudo systemctl enable $app
+	sudo systemctl daemon-reload
+}
+
+ynh_remove_systemd_config () {
+	finalsystemdconf="/etc/systemd/system/$app.service"
+	if [ -e "$finalsystemdconf" ]; then
+		sudo systemctl stop $app
+		sudo systemctl disable $app
+		ynh_secure_remove "$finalsystemdconf"
+	fi
+}
+
+#=================================================
+#=================================================
+
+#=================================================
+# CHECKING
+#=================================================
+
+CHECK_DOMAINPATH () {	# Vérifie la disponibilité du path et du domaine.
+	if sudo yunohost app --help | grep --quiet url-available
+	then
+		# Check availability of a web path
+		ynh_webpath_available $domain $path_url
+		# Register/book a web path for an app
+		ynh_webpath_register $app $domain $path_url
+	else
+		# Use the legacy command
+		sudo yunohost app checkurl $domain$path_url -a $app
+	fi
+}
+
+CHECK_FINALPATH () {	# Vérifie que le dossier de destination n'est pas déjà utilisé.
+	final_path=/var/www/$app
+	test ! -e "$final_path" || ynh_die "This path already contains a folder"
+}
+
+#=================================================
+# DISPLAYING
+#=================================================
+
+NO_PRINT () {	# Supprime l'affichage dans stdout pour la commande en argument.
+	set +x
+	$@
+	set -x
+}
+
+WARNING () {	# Écrit sur le canal d'erreur pour passer en warning.
+	$@ >&2
+}
+
+SUPPRESS_WARNING () {	# Force l'écriture sur la sortie standard
+	$@ 2>&1
+}
+
+QUIET () {	# Redirige la sortie standard dans /dev/null
+	$@ > /dev/null
+}
+
+ALL_QUIET () {	# Redirige la sortie standard et d'erreur dans /dev/null
+	$@ > /dev/null 2>&1
+}
+
+#=================================================
+# BACKUP
+#=================================================
+
+BACKUP_FAIL_UPGRADE () {
+	WARNING echo "Upgrade failed."
+	app_bck=${app//_/-}	# Replace all '_' by '-'
+	if sudo yunohost backup list | grep -q $app_bck-pre-upgrade$backup_number; then	# Vérifie l'existence de l'archive avant de supprimer l'application et de restaurer
+		sudo yunohost app remove $app	# Supprime l'application avant de la restaurer.
+		sudo yunohost backup restore --ignore-hooks $app_bck-pre-upgrade$backup_number --apps $app --force	# Restore the backup if upgrade failed
+		ynh_die "The app was restored to the way it was before the failed upgrade."
+	fi
+}
+
+BACKUP_BEFORE_UPGRADE () {	# Backup the current version of the app, restore it if the upgrade fails
+	backup_number=1
+	old_backup_number=2
+	app_bck=${app//_/-}	# Replace all '_' by '-'
+	if sudo yunohost backup list | grep -q $app_bck-pre-upgrade1; then	# Vérifie l'existence d'une archive déjà numéroté à 1.
+		backup_number=2	# Et passe le numéro de l'archive à 2
+		old_backup_number=1
+	fi
+
+	sudo yunohost backup create --ignore-hooks --apps $app --name $app_bck-pre-upgrade$backup_number	# Créer un backup différent de celui existant.
+	if [ "$?" -eq 0 ]; then	# Si le backup est un succès, supprime l'archive précédente.
+		if sudo yunohost backup list | grep -q $app_bck-pre-upgrade$old_backup_number; then	# Vérifie l'existence de l'ancienne archive avant de la supprimer, pour éviter une erreur.
+			QUIET sudo yunohost backup delete $app_bck-pre-upgrade$old_backup_number
+		fi
+	else	# Si le backup a échoué
+		ynh_die "Backup failed, the upgrade process was aborted."
+	fi
+}
+
+HUMAN_SIZE () {	# Transforme une taille en Ko en une taille lisible pour un humain
+	human=$(numfmt --to=iec --from-unit=1K $1)
+	echo $human
+}
+
+CHECK_SIZE () {	# Vérifie avant chaque backup que l'espace est suffisant
+	file_to_analyse=$1
+	backup_size=$(sudo du --summarize "$file_to_analyse" | cut -f1)
+	free_space=$(sudo df --output=avail "/home/yunohost.backup" | sed 1d)
+
+	if [ $free_space -le $backup_size ]
+	then
+		WARNING echo "Espace insuffisant pour sauvegarder $file_to_analyse."
+		WARNING echo "Espace disponible: $(HUMAN_SIZE $free_space)"
+		ynh_die "Espace nécessaire: $(HUMAN_SIZE $backup_size)"
+	fi
+}
+
+# Ce helper est temporaire et sert de remplacement à la véritable fonction ynh_restore_file. Le temps qu'elle arrive...
+ynh_restore_file () {
+	if [ -f "$1" ]; then
+		ynh_die "There is already a file at this path: $1"
+	fi
+	sudo cp -a "${YNH_APP_BACKUP_DIR}$1" "$1"
+}
+
+#=================================================
+# PACKAGE CHECK BYPASSING...
+#=================================================
+
+IS_PACKAGE_CHECK () {	# Détermine une exécution en conteneur (Non testé)
+	return $(uname -n | grep -c 'pchecker_lxc')
+}
+
+#=================================================
+# NODEJS
+#=================================================
+
+sudo_path () {
+	sudo env "PATH=$PATH" $@
+}
+
+# INFOS
+# n (Node version management) utilise la variable PATH pour stocker le path de la version de node à utiliser.
+# C'est ainsi qu'il change de version
+# En attendant une généralisation de root, il est possible d'utiliser sudo avec le helper temporaire sudo_path
+# Il permet d'utiliser sudo en gardant le $PATH modifié
+# ynh_install_nodejs installe la version de nodejs demandée en argument, avec n
+# ynh_use_nodejs active une version de nodejs dans le script courant
+# 3 variables sont mises à disposition, et 2 sont stockées dans la config de l'app
+# - nodejs_path: Le chemin absolu de cette version de node
+# Utilisé pour des appels directs à node.
+# - nodejs_version: Simplement le numéro de version de nodejs pour cette application
+# - nodejs_use_version: Un alias pour charger une version de node dans le shell courant.
+# Utilisé pour démarrer un service ou un script qui utilise node ou npm
+# Dans ce cas, c'est $PATH qui contient le chemin de la version de node. Il doit être propagé sur les autres shell si nécessaire.
+
+n_install_dir="/opt/node_n"
+ynh_use_nodejs () {
+	nodejs_version=$(ynh_app_setting_get $app nodejs_version)
+
+	load_n_path="[[ :$PATH: == *\":$n_install_dir/bin:\"* ]] || PATH+=\":$n_install_dir/bin\""
+
+	nodejs_use_version="n $nodejs_version"
+
+	# "Load" a version of node
+	eval $load_n_path; $nodejs_use_version
+	eval $load_n_path; sudo env "PATH=$PATH" $nodejs_use_version
+
+	# Get the absolute path of this version of node
+	nodejs_path="$(n bin $nodejs_version)"
+
+	# Make an alias for node use
+	ynh_node_exec="eval $load_n_path; n use $nodejs_version"
+	sudo_ynh_node_exec="eval $load_n_path; sudo env \"PATH=$PATH\" n use $nodejs_version"
+}
+
+ynh_install_nodejs () {
+	# Use n, https://github.com/tj/n to manage the nodejs versions
+	local nodejs_version="$1"
+	local n_install_script="https://git.io/n-install"
+
+	# Create $n_install_dir
+	sudo mkdir -p "$n_install_dir"
+
+	# Load n path in PATH
+	PATH+=":$n_install_dir/bin"
+
+	# If n is not previously setup, install it
+	n --version > /dev/null 2>&1 || \
+	( echo "Installation of N - Node.js version management" >&2; \
+	curl -sL $n_install_script | sudo N_PREFIX="$n_install_dir" bash -s -- -y $nodejs_version )
+
+	# Install the requested version of nodejs (except for the first installation of n, which installed the requested version of node.)
+	sudo env "PATH=$PATH" n $nodejs_version
+
+	# Use the real installed version. Sometimes slightly different
+	nodejs_version=$(node --version | cut -c2-)
+
+	# Store the ID of this app and the version of node requested for it
+	echo "$YNH_APP_ID:$nodejs_version" | sudo tee --append "$n_install_dir/ynh_app_version"
+
+	# Store nodejs_version into the config of this app
+	ynh_app_setting_set $app nodejs_version $nodejs_version
+
+	ynh_use_nodejs
+}
+
+ynh_remove_nodejs () {
+	ynh_use_nodejs
+
+	# Remove the line for this app
+	sudo sed --in-place "/$YNH_APP_ID:$nodejs_version/d" "$n_install_dir/ynh_app_version"
+
+	# If none another app uses this version of nodejs, remove it.
+	if ! grep --quiet "$nodejs_version" "$n_install_dir/ynh_app_version"
+	then
+		n rm $nodejs_version
+	fi
+
+	# If none another app uses n, remove n
+	if [ ! -s "$n_install_dir/ynh_app_version" ]
+	then
+		ynh_secure_remove "$n_install_dir"
+		sudo sed --in-place "/N_PREFIX/d" /root/.bashrc
+	fi
+}
+
+#=================================================
+#=================================================
+# FUTUR YNH HELPERS
+#=================================================
+# Importer ce fichier de fonction avant celui des helpers officiel
+# Ainsi, les officiels prendront le pas sur ceux-ci le cas échéant
+#=================================================
+
+# Normalize the url path syntax
+# Handle the slash at the beginning of path and its absence at ending
+# Return a normalized url path
+#
+# example: url_path=$(ynh_normalize_url_path $url_path)
+#          ynh_normalize_url_path example -> /example
+#          ynh_normalize_url_path /example -> /example
+#          ynh_normalize_url_path /example/ -> /example
+#          ynh_normalize_url_path / -> /
+#
+# usage: ynh_normalize_url_path path_to_normalize
+# | arg: url_path_to_normalize - URL path to normalize before using it
+ynh_normalize_url_path () {
+	path_url=$1
+	test -n "$path_url" || ynh_die "ynh_normalize_url_path expect a URL path as first argument and received nothing."
+	if [ "${path_url:0:1}" != "/" ]; then    # If the first character is not a /
+		path_url="/$path_url"    # Add / at begin of path variable
+	fi
+	if [ "${path_url:${#path_url}-1}" == "/" ] && [ ${#path_url} -gt 1 ]; then    # If the last character is a / and that not the only character.
+		path_url="${path_url:0:${#path_url}-1}"	# Delete the last character
+	fi
+	echo $path_url
+}
+
+# Check if a mysql user exists
+#
+# usage: ynh_mysql_user_exists user
+# | arg: user - the user for which to check existence
+function ynh_mysql_user_exists()
+{
+   local user=$1
+   if [[ -z $(ynh_mysql_execute_as_root "SELECT User from mysql.user WHERE User = '$user';") ]]
+   then
+      return 1
+   else
+      return 0
+   fi
+}
+
+# Create a database, an user and its password. Then store the password in the app's config
+#
+# After executing this helper, the password of the created database will be available in $db_pwd
+# It will also be stored as "mysqlpwd" into the app settings.
+#
+# usage: ynh_mysql_setup_db user name [pwd]
+# | arg: user - Owner of the database
+# | arg: name - Name of the database
+# | arg: pwd - Password of the database. If not given, a password will be generated
+ynh_mysql_setup_db () {
+	local db_user="$1"
+	local db_name="$2"
+	local new_db_pwd=$(ynh_string_random)	# Generate a random password
+	db_pwd="${3:-$new_db_pwd}"
+	ynh_mysql_create_db "$db_name" "$db_user" "$db_pwd"	# Create the database
+	ynh_app_setting_set $app mysqlpwd $db_pwd	# Store the password in the app's config
+}
+
+# Remove a database if it exists, and the associated user
+#
+# usage: ynh_mysql_remove_db user name
+# | arg: user - Owner of the database
+# | arg: name - Name of the database
+ynh_mysql_remove_db () {
+	local db_user="$1"
+	local db_name="$2"
+	local mysql_root_password=$(sudo cat $MYSQL_ROOT_PWD_FILE)
+	if mysqlshow -u root -p$mysql_root_password | grep -q "^| $db_name"; then	# Check if the database exists
+		echo "Removing database $db_name" >&2
+		ynh_mysql_drop_db $db_name	# Remove the database	
+	else
+		echo "Database $db_name not found" >&2
+	fi
+
+	# Remove mysql user if it exists
+        if $(ynh_mysql_user_exists $db_user); then
+		ynh_mysql_drop_user $db_user
+	fi
+}
+
+# Correct the name given in argument for mariadb
+#
+# Avoid invalid name for your database
+#
+# Exemple: dbname=$(ynh_make_valid_dbid $app)
+#
+# usage: ynh_make_valid_dbid name
+# | arg: name - name to correct
+# | ret: the corrected name
+ynh_sanitize_dbid () {
+	dbid=${1//[-.]/_}	# We should avoid having - and . in the name of databases. They are replaced by _
+	echo $dbid
+}
+
+# Manage a fail of the script
+#
+# Print a warning to inform that the script was failed
+# Execute the ynh_clean_setup function if used in the app script
+#
+# usage of ynh_clean_setup function
+# This function provide a way to clean some residual of installation that not managed by remove script.
+# To use it, simply add in your script:
+# ynh_clean_setup () {
+#        instructions...
+# }
+# This function is optionnal.
+#
+# Usage: ynh_exit_properly is used only by the helper ynh_abort_if_errors.
+# You must not use it directly.
+ynh_exit_properly () {
+	exit_code=$?
+	if [ "$exit_code" -eq 0 ]; then
+			exit 0	# Exit without error if the script ended correctly
+	fi
+
+	trap '' EXIT	# Ignore new exit signals
+	set +eu	# Do not exit anymore if a command fail or if a variable is empty
+
+	echo -e "!!\n  $app's script has encountered an error. Its execution was cancelled.\n!!" >&2
+
+	if type -t ynh_clean_setup > /dev/null; then	# Check if the function exist in the app script.
+		ynh_clean_setup	# Call the function to do specific cleaning for the app.
+	fi
+
+	ynh_die	# Exit with error status
+}
+
+# Exit if an error occurs during the execution of the script.
+#
+# Stop immediatly the execution if an error occured or if a empty variable is used.
+# The execution of the script is derivate to ynh_exit_properly function before exit.
+#
+# Usage: ynh_abort_if_errors
+ynh_abort_if_errors () {
+	set -eu	# Exit if a command fail, and if a variable is used unset.
+	trap ynh_exit_properly EXIT	# Capturing exit signals on shell script
+}
+
+# Define and install dependencies with a equivs control file
+# This helper can/should only be called once per app
+#
+# usage: ynh_install_app_dependencies dep [dep [...]]
+# | arg: dep - the package name to install in dependence
+ynh_install_app_dependencies () {
+    dependencies=$@
+    manifest_path="../manifest.json"
+    if [ ! -e "$manifest_path" ]; then
+    	manifest_path="../settings/manifest.json"	# Into the restore script, the manifest is not at the same place
+    fi
+    version=$(sudo grep '\"version\": ' "$manifest_path" | cut -d '"' -f 4)	# Retrieve the version number in the manifest file.
+    dep_app=${app//_/-}	# Replace all '_' by '-'
+
+    if ynh_package_is_installed "${dep_app}-ynh-deps"; then
+		echo "A package named ${dep_app}-ynh-deps is already installed" >&2
+    else
+        cat > ./${dep_app}-ynh-deps.control << EOF	# Make a control file for equivs-build
+Section: misc
+Priority: optional
+Package: ${dep_app}-ynh-deps
+Version: ${version}
+Depends: ${dependencies// /, }
+Architecture: all
+Description: Fake package for ${app} (YunoHost app) dependencies
+ This meta-package is only responsible of installing its dependencies.
+EOF
+        ynh_package_install_from_equivs ./${dep_app}-ynh-deps.control \
+            || ynh_die "Unable to install dependencies"	# Install the fake package and its dependencies
+        ynh_app_setting_set $app apt_dependencies $dependencies
+    fi
+}
+
+# Remove fake package and its dependencies
+#
+# Dependencies will removed only if no other package need them.
+#
+# usage: ynh_remove_app_dependencies
+ynh_remove_app_dependencies () {
+    dep_app=${app//_/-}	# Replace all '_' by '-'
+    ynh_package_autoremove ${dep_app}-ynh-deps	# Remove the fake package and its dependencies if they not still used.
+}
+
+# Use logrotate to manage the logfile
+#
+# usage: ynh_use_logrotate [logfile]
+# | arg: logfile - absolute path of logfile
+#
+# If no argument provided, a standard directory will be use. /var/log/${app}
+# You can provide a path with the directory only or with the logfile.
+# /parentdir/logdir/
+# /parentdir/logdir/logfile.log
+#
+# It's possible to use this helper several times, each config will added to same logrotate config file.
+ynh_use_logrotate () {
+	if [ "$#" -gt 0 ]; then
+		if [ "$(echo ${1##*.})" == "log" ]; then	# Keep only the extension to check if it's a logfile
+			logfile=$1	# In this case, focus logrotate on the logfile
+		else
+			logfile=$1/.log	# Else, uses the directory and all logfile into it.
+		fi
+	else
+		logfile="/var/log/${app}/*.log" # Without argument, use a defaut directory in /var/log
+	fi
+	cat > ./${app}-logrotate << EOF	# Build a config file for logrotate
+$logfile {
+		# Rotate if the logfile exceeds 100Mo
+	size 100M
+		# Keep 12 old log maximum
+	rotate 12
+		# Compress the logs with gzip
+	compress
+		# Compress the log at the next cycle. So keep always 2 non compressed logs
+	delaycompress
+		# Copy and truncate the log to allow to continue write on it. Instead of move the log.
+	copytruncate
+		# Do not do an error if the log is missing
+	missingok
+		# Not rotate if the log is empty
+	notifempty
+		# Keep old logs in the same dir
+	noolddir
+}
+EOF
+	sudo mkdir -p $(dirname "$logfile")	# Create the log directory, if not exist
+	cat ${app}-logrotate | sudo tee -a /etc/logrotate.d/$app > /dev/null	# Append this config to the others for this app. If a config file already exist
+}
+
+# Remove the app's logrotate config.
+#
+# usage: ynh_remove_logrotate
+ynh_remove_logrotate () {
+	if [ -e "/etc/logrotate.d/$app" ]; then
+		sudo rm "/etc/logrotate.d/$app"
+	fi
+}
+
+# Find a free port and return it
+#
+# example: port=$(ynh_find_port 8080)
+#
+# usage: ynh_find_port begin_port
+# | arg: begin_port - port to start to search
+ynh_find_port () {
+	port=$1
+	test -n "$port" || ynh_die "The argument of ynh_find_port must be a valid port."
+	while netcat -z 127.0.0.1 $port       # Check if the port is free
+	do
+		port=$((port+1))	# Else, pass to next port
+	done
+	echo $port
+}
+
+# Create a system user
+#
+# usage: ynh_system_user_create user_name [home_dir]
+# | arg: user_name - Name of the system user that will be create
+# | arg: home_dir - Path of the home dir for the user. Usually the final path of the app. If this argument is omitted, the user will be created without home
+ynh_system_user_create () {
+	if ! ynh_system_user_exists "$1"	# Check if the user exists on the system
+	then	# If the user doesn't exist
+		if [ $# -ge 2 ]; then	# If a home dir is mentioned
+			user_home_dir="-d $2"
+		else
+			user_home_dir="--no-create-home"
+		fi
+		sudo useradd $user_home_dir --system --user-group $1 --shell /usr/sbin/nologin || ynh_die "Unable to create $1 system account"
+	fi
+}
+
+# Delete a system user
+#
+# usage: ynh_system_user_delete user_name
+# | arg: user_name - Name of the system user that will be create
+ynh_system_user_delete () {
+    if ynh_system_user_exists "$1"	# Check if the user exists on the system
+    then
+		echo "Remove the user $1" >&2
+		sudo userdel $1
+	else
+		echo "The user $1 was not found" >&2
+    fi
+}
+
+# Curl abstraction to help with POST requests to local pages (such as installation forms)
+#
+# $domain and $path_url should be defined externally (and correspond to the domain.tld and the /path (of the app?))
+#
+# example: ynh_local_curl "/install.php?installButton" "foo=$var1" "bar=$var2"
+# 
+# usage: ynh_local_curl "page_uri" "key1=value1" "key2=value2" ...
+# | arg: page_uri    - Path (relative to $path_url) of the page where POST data will be sent
+# | arg: key1=value1 - (Optionnal) POST key and corresponding value
+# | arg: key2=value2 - (Optionnal) Another POST key and corresponding value
+# | arg: ...         - (Optionnal) More POST keys and values
+ynh_local_curl () {
+	# Define url of page to curl
+	full_page_url=https://localhost$path_url$1
+
+	# Concatenate all other arguments with '&' to prepare POST data
+	POST_data=""
+	for arg in "${@:2}"
+	do
+		POST_data="${POST_data}${arg}&"
+	done
+	if [ -n "$POST_data" ]
+	then
+		# Add --data arg and remove the last character, which is an unecessary '&'
+		POST_data="--data \"${POST_data::-1}\""
+	fi
+
+	# Curl the URL
+	curl --silent --show-error -kL -H "Host: $domain" --resolve $domain:443:127.0.0.1 $POST_data "$full_page_url"
+}
+
+# Substitute/replace a string by another in a file
+#
+# usage: ynh_replace_string match_string replace_string target_file
+# | arg: match_string - String to be searched and replaced in the file
+# | arg: replace_string - String that will replace matches
+# | arg: target_file - File in which the string will be replaced.
+ynh_replace_string () {
+	delimit=@
+	match_string=${1//${delimit}/"\\${delimit}"}	# Escape the delimiter if it's in the string.
+	replace_string=${2//${delimit}/"\\${delimit}"}
+	workfile=$3
+
+	sudo sed --in-place "s${delimit}${match_string}${delimit}${replace_string}${delimit}g" "$workfile"
+}
+
+# Remove a file or a directory securely
+#
+# usage: ynh_secure_remove path_to_remove
+# | arg: path_to_remove - File or directory to remove
+ynh_secure_remove () {
+	path_to_remove=$1
+	forbidden_path=" \
+	/var/www \
+	/home/yunohost.app"
+
+	if [[ "$forbidden_path" =~ "$path_to_remove" \
+		# Match all paths or subpaths in $forbidden_path
+		|| "$path_to_remove" =~ ^/[[:alnum:]]+$ \
+		# Match all first level paths from / (Like /var, /root, etc...)
+		|| "${path_to_remove:${#path_to_remove}-1}" = "/" ]]
+		# Match if the path finishes by /. Because it seems there is an empty variable
+	then
+		echo "Avoid deleting $path_to_remove." >&2
+	else
+		if [ -e "$path_to_remove" ]
+		then
+			sudo rm -R "$path_to_remove"
+		else
+			echo "$path_to_remove wasn't deleted because it doesn't exist." >&2
+		fi
+	fi
+}
+
+# Download, check integrity, uncompress and patch the source from app.src
+#
+# The file conf/app.src need to contains:
+# 
+# SOURCE_URL=Address to download the app archive
+# SOURCE_SUM=Control sum
+# # (Optional) Programm to check the integrity (sha256sum, md5sum$YNH_EXECUTION_DIR/...)
+# # default: sha256
+# SOURCE_SUM_PRG=sha256
+# # (Optional) Archive format
+# # default: tar.gz
+# SOURCE_FORMAT=tar.gz
+# # (Optional) Put false if source are directly in the archive root
+# # default: true
+# SOURCE_IN_SUBDIR=false
+# # (Optionnal) Name of the local archive (offline setup support)
+# # default: ${src_id}.${src_format}
+# SOURCE_FILENAME=example.tar.gz 
+#
+# Details:
+# This helper download sources from SOURCE_URL if there is no local source
+# archive in /opt/yunohost-apps-src/APP_ID/SOURCE_FILENAME
+# 
+# Next, it check the integrity with "SOURCE_SUM_PRG -c --status" command.
+# 
+# If it's ok, the source archive will be uncompress in $dest_dir. If the
+# SOURCE_IN_SUBDIR is true, the first level directory of the archive will be
+# removed.
+#
+# Finally, patches named sources/patches/${src_id}-*.patch and extra files in
+# sources/extra_files/$src_id will be applyed to dest_dir
+#
+#
+# usage: ynh_setup_source dest_dir [source_id]
+# | arg: dest_dir  - Directory where to setup sources
+# | arg: source_id - Name of the app, if the package contains more than one app
+YNH_EXECUTION_DIR="."
+ynh_setup_source () {
+    local dest_dir=$1
+    local src_id=${2:-app} # If the argument is not given, source_id equal "app"
+
+    # Load value from configuration file (see above for a small doc about this file
+    # format)
+    local src_url=$(grep 'SOURCE_URL=' "$YNH_EXECUTION_DIR/../conf/${src_id}.src" | cut -d= -f2-)
+    local src_sum=$(grep 'SOURCE_SUM=' "$YNH_EXECUTION_DIR/../conf/${src_id}.src" | cut -d= -f2-)
+    local src_sumprg=$(grep 'SOURCE_SUM_PRG=' "$YNH_EXECUTION_DIR/../conf/${src_id}.src" | cut -d= -f2-)
+    local src_format=$(grep 'SOURCE_FORMAT=' "$YNH_EXECUTION_DIR/../conf/${src_id}.src" | cut -d= -f2-)
+    local src_in_subdir=$(grep 'SOURCE_IN_SUBDIR=' "$YNH_EXECUTION_DIR/../conf/${src_id}.src" | cut -d= -f2-)
+    local src_filename=$(grep 'SOURCE_FILENAME=' "$YNH_EXECUTION_DIR/../conf/${src_id}.src" | cut -d= -f2-)
+
+    # Default value
+    src_sumprg=${src_sumprg:-sha256sum}
+    src_in_subdir=${src_in_subdir:-true}
+    src_format=${src_format:-tar.gz}
+    src_format=$(echo "$src_format" | tr '[:upper:]' '[:lower:]')
+    if [ "$src_filename" = "" ] ; then
+        src_filename="${src_id}.${src_format}"
+    fi
+    local local_src="/opt/yunohost-apps-src/${YNH_APP_ID}/${src_filename}"
+
+    if test -e "$local_src"
+    then    # Use the local source file if it is present
+        cp $local_src $src_filename
+    else    # If not, download the source
+        wget -nv -O $src_filename $src_url
+    fi
+
+    # Check the control sum
+    echo "${src_sum} ${src_filename}" | ${src_sumprg} -c --status \
+        || ynh_die "Corrupt source"
+
+    # Extract source into the app dir
+    sudo mkdir -p "$dest_dir"
+    if [ "$src_format" = "zip" ]
+    then 
+        # Zip format
+        # Using of a temp directory, because unzip doesn't manage --strip-components
+        if $src_in_subdir ; then
+            local tmp_dir=$(mktemp -d)
+            sudo unzip -quo $src_filename -d "$tmp_dir"
+            sudo cp -a $tmp_dir/*/. "$dest_dir"
+            ynh_secure_remove "$tmp_dir"
+        else
+            sudo unzip -quo $src_filename -d "$dest_dir"
+        fi
+    else
+        local strip=""
+        if $src_in_subdir ; then
+            strip="--strip-components 1"
+        fi
+        if [[ "$src_format" =~ ^tar.gz|tar.bz2|tar.xz$ ]] ; then
+            sudo tar -xf $src_filename -C "$dest_dir" $strip
+        else
+            ynh_die "Archive format unrecognized."
+        fi
+    fi
+
+    # Apply patches
+    if (( $(find $YNH_EXECUTION_DIR/../sources/patches/ -type f -name "${src_id}-*.patch" 2> /dev/null | wc -l) > "0" )); then
+        local old_dir=$(pwd)
+        (cd "$dest_dir" \
+            && for p in $YNH_EXECUTION_DIR/../sources/patches/${src_id}-*.patch; do \
+                sudo patch -p1 < $p; done) \
+            || ynh_die "Unable to apply patches"
+        cd $old_dir
+    fi
+
+    # Add supplementary files
+    if test -e "$YNH_EXECUTION_DIR/../sources/extra_files/${src_id}"; then
+        sudo cp -a $YNH_EXECUTION_DIR/../sources/extra_files/$src_id/. "$dest_dir"
+    fi
+}
+
+# Check availability of a web path
+#
+# example: ynh_webpath_available some.domain.tld /coffee
+#
+# usage: ynh_webpath_available domain path
+# | arg: domain - the domain/host of the url
+# | arg: path - the web path to check the availability of
+ynh_webpath_available () {
+	local domain=$1
+	local path=$2
+	sudo yunohost domain url-available $domain $path
+}
+
+# Register/book a web path for an app
+#
+# example: ynh_webpath_register wordpress some.domain.tld /coffee
+#
+# usage: ynh_webpath_register app domain path
+# | arg: app - the app for which the domain should be registered
+# | arg: domain - the domain/host of the web path
+# | arg: path - the web path to be registered
+ynh_webpath_register () {
+	local app=$1
+	local domain=$2
+	local path=$3
+	sudo yunohost app register-url $app $domain $path
+}
+
+# Calculate and store a file checksum into the app settings
+#
+# $app should be defined when calling this helper
+#
+# usage: ynh_store_file_checksum file
+# | arg: file - The file on which the checksum will performed, then stored.
+ynh_store_file_checksum () {
+	local checksum_setting_name=checksum_${1//[\/ ]/_}	# Replace all '/' and ' ' by '_'
+	ynh_app_setting_set $app $checksum_setting_name $(sudo md5sum "$1" | cut -d' ' -f1)
+}
+
+# Verify the checksum and backup the file if it's different
+# This helper is primarily meant to allow to easily backup personalised/manually 
+# modified config files.
+#
+# $app should be defined when calling this helper
+#
+# usage: ynh_backup_if_checksum_is_different file
+# | arg: file - The file on which the checksum test will be perfomed.
+#
+# | ret: Return the name a the backup file, or nothing
+ynh_backup_if_checksum_is_different () {
+	local file=$1
+	local checksum_setting_name=checksum_${file//[\/ ]/_}	# Replace all '/' and ' ' by '_'
+	local checksum_value=$(ynh_app_setting_get $app $checksum_setting_name)
+	if [ -n "$checksum_value" ]
+	then	# Proceed only if a value was stored into the app settings
+		if ! echo "$checksum_value $file" | sudo md5sum -c --status
+		then	# If the checksum is now different
+			backup_file="/home/yunohost.conf/backup/$file.backup.$(date '+%Y%m%d.%H%M%S')"
+			sudo mkdir -p "$(dirname "$backup_file")"
+			sudo cp -a "$file" "$backup_file"	# Backup the current file
+			echo "File $file has been manually modified since the installation or last upgrade. So it has been duplicated in $backup_file" >&2
+			echo "$backup_file"	# Return the name of the backup file
+		fi
+	fi
+}

scripts/backup

@@ -1,29 +1,63 @@
 #!/bin/bash
 
-# The parameter $1 is the backup directory location dedicated to the app
+#=================================================
-backup_dir=$1
+# GENERIC STARTING
+#=================================================
+# MANAGE FAILURE OF THE SCRIPT
+#=================================================
 
-# The parameter $2 is theid of the app instance
+# Exit on command errors and treat unset variables as an error
-app=$2
+set -eu
 
-# Source app helpers
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+if [ ! -e _common.sh ]; then
+	# Rapatrie le fichier de fonctions si il n'est pas dans le dossier courant
+	sudo cp ../settings/scripts/_common.sh ./_common.sh
+	sudo chmod a+rx _common.sh
+fi
+source _common.sh
 source /usr/share/yunohost/helpers
 
+#=================================================
+# LOAD SETTINGS
+#=================================================
+
+app=$YNH_APP_INSTANCE_NAME
+
 domain=$(ynh_app_setting_get $app domain)
 final_path=$(ynh_app_setting_get $app final_path)
+db_name=$(ynh_app_setting_get $app db_name)
+db_pwd=$(ynh_app_setting_get $app mysqlpwd)
 
-# Copy the app files
+#=================================================
-sudo mkdir -p ${backup_dir}/var/www
+# STANDARD BACKUP STEPS
-sudo cp -a $final_path "${backup_dir}/var/www/$app"
+#=================================================
+# BACKUP OF THE MAIN DIR OF THE APP
+#=================================================
 
-# Copy the conf files
+CHECK_SIZE "$final_path"
-sudo mkdir -p "${backup_dir}/conf"
+ynh_backup "$final_path" "${YNH_APP_BACKUP_DIR}$final_path"
-sudo cp -a /etc/nginx/conf.d/$domain.d/$app.conf "${backup_dir}/conf/nginx.conf"
 
-# Copy dedicated php-fpm process to backup folder
+#=================================================
-sudo cp -a /etc/php5/fpm/pool.d/$app.conf "${backup_dir}/conf/php-fpm.conf"
+# BACKUP OF THE NGINX CONFIGURATION
-sudo cp -a /etc/php5/fpm/conf.d/20-$app.ini "${backup_dir}/conf/php-fpm.ini"
+#=================================================
 
-# Backup db
+ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" "${YNH_APP_BACKUP_DIR}/etc/nginx/conf.d/$domain.d/$app.conf"
-root_pwd=$(sudo cat /etc/yunohost/mysql)
+
-sudo su -c "mysqldump -u root -p$root_pwd --no-create-db $app > ${backup_dir}/db.sql"
+#=================================================
+# BACKUP OF 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/conf.d/20-$app.ini" "${YNH_APP_BACKUP_DIR}/etc/php5/fpm/conf.d/20-$app.ini"
+
+#=================================================
+# BACKUP OF THE SQL BDD
+#=================================================
+
+ynh_mysql_dump_db "$db_name" > db.sql
+CHECK_SIZE "db.sql"
+# ynh_backup "db.sql" "${YNH_APP_BACKUP_DIR}/db.sql"

scripts/install

@@ -1,17 +1,26 @@
 #!/bin/bash
 
-source .fonctions	# Charge les fonctions génériques habituellement utilisées dans le script
+#=================================================
+# GENERIC STARTING
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
 
-CLEAN_SETUP () {
+source _common.sh
-# Nettoyage des résidus d'installation non pris en charge par le script remove.
+source /usr/share/yunohost/helpers
-	# Clean hosts
+
-	sudo sed -i '/#WORDPRESS/d' /etc/hosts
+#=================================================
-}
+# MANAGE FAILURE OF THE SCRIPT
-TRAP_ON	# Active trap pour arrêter le script si une erreur est détectée.
+#=================================================
+
+ynh_abort_if_errors	# Active trap pour arrêter le script si une erreur est détectée.
+
+#=================================================
+# RETRIEVE ARGUMENTS FROM THE MANIFEST
+#=================================================
 
-# Retrieve arguments
 domain=$YNH_APP_ARG_DOMAIN
-path=$YNH_APP_ARG_PATH
+path_url=$YNH_APP_ARG_PATH
 admin_wordpress=$YNH_APP_ARG_ADMIN
 language=$YNH_APP_ARG_LANGUAGE
 multisite=$YNH_APP_ARG_MULTISITE
@@ -19,63 +28,82 @@ is_public=$YNH_APP_ARG_IS_PUBLIC
 
 app=$YNH_APP_INSTANCE_NAME
 
-# Source app helpers
+#=================================================
-source /usr/share/yunohost/helpers
+# CHECK IF THE APP CAN BE INSTALLED WITH THIS ARGS
+#=================================================
 
-# Vérifie que les variables ne sont pas vides.
+path_url=$(ynh_normalize_url_path $path_url)	# Vérifie et corrige la syntaxe du path.
-CHECK_VAR "$app" "app name not set"
-
-
-CHECK_USER "$admin_wordpress"	# Vérifie la validité de l'user admin
-
-CHECK_PATH	# Vérifie et corrige la syntaxe du path.
 CHECK_DOMAINPATH	# Vérifie la disponibilité du path et du domaine.
-
 CHECK_FINALPATH	# Vérifie que le dossier de destination n'est pas déjà utilisé.
 
-if [ "$path" == "/" ] && [ "$multisite" = "Yes" ]; then
+if [ "$path_url" == "/" ] && [ $multisite -eq 1 ]; then
-    echo "Multisite option of wordpress doesn't work at root of domain." >&2
+	ynh_die "Multisite option of wordpress doesn't work at root of domain."
-	false
 fi
 
-# Enregistre les infos dans la config YunoHost
+#=================================================
+# STORE SETTINGS FROM MANIFEST
+#=================================================
+
 ynh_app_setting_set $app domain $domain
-ynh_app_setting_set $app path $path
+ynh_app_setting_set $app path $path_url
 ynh_app_setting_set $app admin $admin_wordpress
 ynh_app_setting_set $app is_public $is_public
 ynh_app_setting_set $app language $language
 ynh_app_setting_set $app multisite $multisite
 
-GENERATE_DB $app	# Créer une base de données et un utilisateur dédié au nom de l'app.
+#=================================================
+# STANDARD MODIFICATIONS
+#=================================================
+# INSTALL DEPENDENCIES
+#=================================================
 
+ynh_install_app_dependencies php5-cli
+
+#=================================================
+# CREATE A SQL BDD
+#=================================================
+
+db_name=$(ynh_sanitize_dbid $app)
+ynh_app_setting_set $app db_name $db_name
+ynh_mysql_setup_db $db_name $db_name
+
+#=================================================
+# DOWNLOAD, CHECK AND UNPACK SOURCE
+#=================================================
 
-# Crée le repertoire de destination et stocke son emplacement.
-sudo mkdir "$final_path"
 ynh_app_setting_set $app final_path $final_path
+ynh_setup_source "$final_path"	# Télécharge la source, décompresse et copie dans $final_path
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
 
-SETUP_SOURCE "wordpress.tar.gz"	# Télécharge la source, décompresse et copie dans $final_path
+ynh_nginx_config
 
-# Et copie le fichier de config nginx
+#=================================================
-sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
+# CREATE DEDICATED USER
+#=================================================
 
+ynh_system_user_create $app	# Créer un utilisateur système dédié à l'app
 
-# Modifie les variables dans le fichier de configuration nginx
+#=================================================
-sudo sed -i "s@__PATHTOCHANGE__@$path@g" /etc/nginx/conf.d/$domain.d/$app.conf
+# PHP-FPM CONFIGURATION
-sudo sed -i "s@__FINALPATH__@$final_path@g" /etc/nginx/conf.d/$domain.d/$app.conf
+#=================================================
-sudo sed -i "s@__NAMETOCHANGE__@$app@g" /etc/nginx/conf.d/$domain.d/$app.conf
 
-POOL_FPM	# Créer le fichier de configuration du pool php-fpm et le configure.
+ynh_fpm_config	# Créer le fichier de configuration du pool php-fpm et le configure.
 
+#=================================================
+# SPECIFIC SETUP
+#=================================================
+# CONFIGURE WP-CONFIG
+#=================================================
 
 sudo cp ../conf/wp-config.php $final_path/wp-config.php
-
 # Change variables in Wordpress configuration
-sudo sed -i "s/__DB_USER__/$db_user/g" $final_path/wp-config.php
+ynh_replace_string "__DB_USER__" "$db_name" $final_path/wp-config.php
-sudo sed -i "s/__DB_PWD__/$db_pwd/g" $final_path/wp-config.php
+ynh_replace_string "__DB_PWD__" "$db_pwd" $final_path/wp-config.php
-sudo sed -i "s/__DOMAIN__/$domain/g" $final_path/wp-config.php
+ynh_replace_string "__DOMAIN__" "$domain" $final_path/wp-config.php
-sudo sed -i "s@__PATH__@$path@g" $final_path/wp-config.php
+ynh_replace_string "__PATH__" "$path_url" $final_path/wp-config.php
-
 
 for i in 1 2 3 4 5 6 7 8
 do
@@ -86,106 +114,127 @@ do
 		sleep 1
 		j=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{40\}\).*/\1/p')
 	fi
-    sudo sed -i "s/KEY$i/$j/g" $final_path/wp-config.php
+	ynh_replace_string "KEY$i" "$j" $final_path/wp-config.php
 done
 
-# Set permissions to wordpress directory
+#=================================================
-sudo chown -R www-data: $final_path
+# SETTING UP WITH CURL
+#=================================================
 
-# Donne un accès public pour curl
+# Set right permissions for curl install
+sudo chown -R $app: $final_path
+
+# Rend la page d'install publique pour curl
 ynh_app_setting_set $app unprotected_uris "/"
-# Recharge la configuration Nginx
+sudo yunohost app ssowatconf	# Régénère la configuration de SSOwat
-sudo service nginx reload
-# Régénère la configuration de SSOwat
-sudo yunohost app ssowatconf
 
+# Reload Nginx
+sudo systemctl reload nginx
 
 # Wordpress installation
-echo -e "127.0.0.1 $domain #WORDPRESS" | sudo tee -a /etc/hosts
+ynh_local_curl "/wp-admin/install.php?step=2" "&weblog_title=YunoBlog" "user_name=$admin_wordpress" "admin_password=$db_pwd" "admin_password2=$db_pwd" "admin_email=$admin_wordpress@$domain" "language=$language" "Submit=Install+WordPress"
-sleep 1
-curl -kL -H "Host: $domain" --data "&weblog_title=YunoBlog&user_name=$admin_wordpress&admin_password=$db_pwd&admin_password2=$db_pwd&admin_email=$admin_wordpress@$domain&language=$language&Submit=Install+WordPress" https://localhost$path/wp-admin/install.php?step=2 > /dev/null 2>&1
 
-echo -n "Please wait during Wordpress installation" >&2
+WARNING echo -n "Please wait during Wordpress installation"
 for i in `seq 1 300`
 do	# La boucle attend la fin de l'installation de wordpress Ou 5 minutes.
-	if mysql --debug-check -u $db_user -p$db_pwd $db_user -e "show tables" | grep -q "wp_options"; then
+	if ynh_mysql_connect_as $db_name $db_pwd $db_name <<< "show tables" | grep -q "wp_options"; then
 		break	# Si la table wp_options est trouvée, l'installation de wordpress est terminée. Quitte la boucle.
 	fi
-	echo -n "." >&2
+	WARNING echo -n "."
 	sleep 1
 done
 
+#=================================================
+# LOAD SQL CONFIG
+#=================================================
+
 # Replace variables in sql scripts
-sudo sed -i "s@__DOMAIN_PATH__@$domain$path@g" ../conf/sql/*.sql
+ynh_replace_string "__DOMAIN_PATH__" "$domain$path_url" ../conf/sql/*.sql
-sudo sed -i "s/__LANGUAGE__/$language/g" ../conf/sql/*.sql
+ynh_replace_string "__LANGUAGE__" "$language" ../conf/sql/*.sql
-sudo sed -i "s/__DATE__/$(date +%s)/g" ../conf/sql/*.sql
+ynh_replace_string "__DATE__" "$(date +%s)" ../conf/sql/*.sql
 
 # Charge les commandes sql communes à tous les scripts.
-mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/common.sql
+# mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/common.sql
+ynh_mysql_connect_as $db_name $db_pwd $db_name < ../conf/sql/common.sql
 
-if [ "$multisite" = "Yes" ]
+#=================================================
+# CONFIGURE MULTISITE
+#=================================================
+
+if [ $multisite -eq 1 ]
 then
-	# Installation de php5-cli pour wp-cli
+	ynh_replace_string "#--MULTISITE--" "" /etc/nginx/conf.d/$domain.d/$app.conf
-	sudo apt-get update
-	sudo apt-get install php5-cli -qy
-
-    sudo sed -i "s@#--MULTISITE--@@g" /etc/nginx/conf.d/$domain.d/$app.conf
 	# Autorise le multisite wordpress
-    sudo sed -i "s@//--MULTISITE1--define@define@g" $final_path/wp-config.php
+	ynh_replace_string "//--MULTISITE1--define" "define " $final_path/wp-config.php
 
 	# Active le multisite via wp-cli.
 	sudo wget -nv https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -O $final_path/wp-cli.phar
-  	php $final_path/wp-cli.phar core multisite-convert --path=$final_path --base=$path/ > /dev/null 2>&1
+	ALL_QUIET php $final_path/wp-cli.phar core multisite-convert --allow-root --path=$final_path --base=$path_url/
-# 	echo "The 2 warnings of php about \"Permission denied\" on wp-config.php are normal. The install script writing into this file, not wp-cli!"
 
 	# Active le multisite wordpress
-    sudo sed -i "s@//--MULTISITE2--define@define@g" $final_path/wp-config.php
+	ynh_replace_string "//--MULTISITE2--define" "define" $final_path/wp-config.php
 
 	# Charge les commandes sql pour activer les plugins
-    if [ "$is_public" = "No" ];
+	if [ $is_public -eq 0 ]
 	then
-		sudo sed -i "s@#--PRIVATE--@@g" ../conf/sql/multisite.sql
+		ynh_replace_string "#--PRIVATE--" "" ../conf/sql/multisite.sql
 	else
-		sudo sed -i "s@#--PUBLIC--@@g" ../conf/sql/multisite.sql
+		ynh_replace_string "#--PUBLIC--" "" ../conf/sql/multisite.sql
 	fi
-	mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/multisite.sql
+	ynh_mysql_connect_as $db_name $db_pwd $db_name < ../conf/sql/multisite.sql
 else
-	if [ "$is_public" = "No" ];
+	if [ $is_public -eq 0 ]
 	then
-		sudo sed -i "s@#--PRIVATE--@@g" /etc/nginx/conf.d/$domain.d/$app.conf
+		ynh_replace_string "#--PRIVATE--" "" /etc/nginx/conf.d/$domain.d/$app.conf
-		sudo sed -i "s@#--PRIVATE--@@g" ../conf/sql/single.sql
+		ynh_replace_string "#--PRIVATE--" "" ../conf/sql/single.sql
 	else
-		sudo sed -i "s@//--PUBLIC--define@define@g" $final_path/wp-config.php
+		ynh_replace_string "//--PUBLIC--define" "define" $final_path/wp-config.php
-		sudo sed -i "s@#--PRIVATE--@#@g" /etc/nginx/conf.d/$domain.d/$app.conf
+		ynh_replace_string "#--PRIVATE--" "#" /etc/nginx/conf.d/$domain.d/$app.conf
-		sudo sed -i "s@#--PUBLIC--@@g" ../conf/sql/single.sql
+		ynh_replace_string "#--PUBLIC--" "" ../conf/sql/single.sql
 	fi
 	# Charge les commandes sql pour activer les plugins
-	mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/single.sql
+	ynh_mysql_connect_as $db_name $db_pwd $db_name < ../conf/sql/single.sql
 fi
 
 # Décommente les add_filter, qui auraient provoqué une erreur avec wp-cli
-sudo sed -i "s@//add_filter@add_filter@g" $final_path/wp-config.php
+ynh_replace_string "//add_filter" "add_filter" $final_path/wp-config.php
 
-STORE_MD5_CONFIG "wp-config.php" "$final_path/wp-config.php"	# Enregistre la somme de contrôle du fichier de config
+#=================================================
+# STORE THE CHECKSUM OF THE CONFIG FILE
+#=================================================
 
+ynh_store_file_checksum "$final_path/wp-config.php"	# Enregistre la somme de contrôle du fichier de config
 
-# Configure les droits d'accès au fichiers
+#=================================================
-# Les fichiers appartiennent à www-data, pour permettre les mises à jour.
+# GENERIC FINALISATION
-sudo chown -R www-data: $final_path
+#=================================================
+# SECURING FILES AND DIRECTORIES
+#=================================================
+
+# Les fichiers appartiennent à l'user wordpress, pour permettre les mises à jour.
+sudo chown -R $app: $final_path
 # Sauf le fichier de config wp-config.php qui appartient à root
 sudo chown root: $final_path/wp-config.php
 
-if [ "$is_public" = "No" ];
+#=================================================
+# SETUP SSOWAT
+#=================================================
+
+if [ $is_public -eq 0 ];
 then
 	# Retire l'accès public
 	ynh_app_setting_delete $app unprotected_uris
-	sudo yunohost app ssowatconf
 fi
 
-sudo service nginx reload
+#=================================================
+# RELOAD NGINX
+#=================================================
 
-# Clean hosts
+sudo systemctl reload nginx
-sudo sed -i '/#WORDPRESS/d' /etc/hosts
+
+#=================================================
+# REMOVE WP-CLI.PHAR
+#=================================================
 
 # wp-cli me semble un peu trop permissif... Il a terminé son travail...
-sudo rm -f $final_path/wp-cli.phar
+ynh_secure_remove $final_path/wp-cli.phar

scripts/remove

@@ -1,23 +1,59 @@
 #!/bin/bash
 
-source .fonctions	# Charge les fonctions génériques habituellement utilisées dans le script
+#=================================================
+# GENERIC STARTING
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
 
-# Source app helpers
+source _common.sh
 source /usr/share/yunohost/helpers
 
-# Récupère les infos de l'application.
+#=================================================
+# LOAD SETTINGS
+#=================================================
+
 app=$YNH_APP_INSTANCE_NAME
+
 domain=$(ynh_app_setting_get $app domain)
+db_name=$(ynh_app_setting_get $app db_name)
 
-REMOVE_BDD $app	# Suppression de la base de donnée et de l'utilisateur associé.
+#=================================================
+# STANDARD REMOVE
+#=================================================
+# REMOVE DEPENDENCIES
+#=================================================
 
-SECURE_REMOVE '/var/www/$app'	# Suppression du dossier de l'application
+ynh_remove_app_dependencies
 
-REMOVE_NGINX_CONF	# Suppression de la configuration nginx
+#=================================================
+# REMOVE THE SQL BDD
+#=================================================
 
-REMOVE_FPM_CONF	# Suppression de la configuration du pool php-fpm
+ynh_mysql_remove_db $db_name $db_name	# Suppression de la base de donnée et de l'utilisateur associé.
 
-# Régénère la configuration de SSOwat
+#=================================================
-sudo yunohost app ssowatconf
+# REMOVE THE MAIN DIR OF THE APP
+#=================================================
 
-echo -e "\e[0m"	# Restore normal color
+ynh_secure_remove "/var/www/$app"	# Suppression du dossier de l'application
+
+#=================================================
+# REMOVE THE NGINX CONFIGURATION
+#=================================================
+
+ynh_remove_nginx_config	# Suppression de la configuration nginx
+
+#=================================================
+# REMOVE THE PHP-FPM CONFIGURATION
+#=================================================
+
+ynh_remove_fpm_config	# Suppression de la configuration du pool php-fpm
+
+#=================================================
+# GENERIC FINALISATION
+#=================================================
+# REMOVE DEDICATED USER
+#=================================================
+
+ynh_system_user_delete $app

scripts/restore

@@ -1,60 +1,96 @@
 #!/bin/bash
-# This restore script is adapted to Yunohost >=2.4
 
-# The parameter $1 is the backup directory location dedicated to the app
+#=================================================
-backup_dir=$1
+# GENERIC STARTING
+#=================================================
+# MANAGE FAILURE OF THE SCRIPT
+#=================================================
 
-# The parameter $2 is the id of the app instance ex: ynhexample__2
+# Exit on command errors and treat unset variables as an error
-app=$2
+set -eu
 
-# Source app helpers
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+if [ ! -e _common.sh ]; then
+	# Rapatrie le fichier de fonctions si il n'est pas dans le dossier courant
+	sudo cp ../settings/scripts/_common.sh ./_common.sh
+	sudo chmod a+rx _common.sh
+fi
+source _common.sh
 source /usr/share/yunohost/helpers
 
-# Get old parameter of the app
+#=================================================
+# LOAD SETTINGS
+#=================================================
+
+app=$YNH_APP_INSTANCE_NAME
+
 domain=$(ynh_app_setting_get $app domain)
-path=$(ynh_app_setting_get $app path)
+path_url=$(ynh_app_setting_get $app path)
 is_public=$(ynh_app_setting_get $app is_public)
 final_path=$(ynh_app_setting_get $app final_path)
+db_name=$(ynh_app_setting_get $app db_name)
 
-if [ -d $final_path ]; then
+#=================================================
-    ynh_die "There is already a directory: $final_path"
+# CHECK IF THE APP CAN BE RESTORED
-fi
+#=================================================
 
-conf=/etc/nginx/conf.d/$domain.d/$app.conf
+sudo yunohost app checkurl "${domain}${path_url}" -a "$app" \
-if [ -f $conf ]; then
+	|| ynh_die "Path not available: ${domain}${path_url}"
-    ynh_die "There is already a nginx conf file at this path: $conf"
+test ! -d $final_path \
-fi
+	|| ynh_die "There is already a directory: $final_path "
-# Restore conf files
-sudo cp -a "${backup_dir}/conf/nginx.conf" $conf
 
-# Reload Nginx
+#=================================================
-sudo service nginx reload
+# STANDARD RESTORE STEPS
+#=================================================
+# RESTORE OF THE NGINX CONFIGURATION
+#=================================================
 
-sudo cp -a "${backup_dir}/var/www/$app" $final_path
+ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf"
+
+#=================================================
+# RESTORE OF THE MAIN DIR OF THE APP
+#=================================================
+
+ynh_restore_file "$final_path"
+
+#=================================================
+# RESTORE OF THE SQL BDD
+#=================================================
 
 db_pwd=$(ynh_app_setting_get $app mysqlpwd)
-db_user=$app
+ynh_mysql_setup_db $db_name $db_name $db_pwd
-ynh_mysql_create_db $db_user $db_user $db_pwd
+ynh_mysql_connect_as $db_name $db_pwd $db_name < ./db.sql
-sudo su -c "mysql -u $db_user -p$db_pwd $app < ${backup_dir}/db.sql"
-sudo rm -f "${backup_dir}/db.sql"
-sudo sed -i -e "s/'DB_USER', *'[^']*'/'DB_USER', '$app'/g" $final_path/wp-config.php
-sudo sed -i -e "s/'DB_NAME', *'[^']*'/'DB_NAME', '$app'/g" $final_path/wp-config.php
 
-# Set permissions
+#=================================================
-# Les fichiers appartiennent à www-data, pour permettre les mises à jour.
+# RECREATE OF THE DEDICATED USER
-sudo chown -R www-data: $final_path
+#=================================================
+
+ynh_system_user_create $app	# Recreate the dedicated user, if not exist
+
+#=================================================
+# RESTORE USER RIGHTS
+#=================================================
+
+# Les fichiers appartiennent à l'user wordpress, pour permettre les mises à jour.
+sudo chown -R $app: $final_path
 # Sauf le fichier de config wp-config.php qui appartient à root
 sudo chown root: $final_path/wp-config.php
 
-# Copy dedicated php-fpm process from backup folder to the right location
+#=================================================
-sudo cp -a $backup_dir/conf/php-fpm.conf /etc/php5/fpm/pool.d/$app.conf
+# RESTORE OF THE PHP-FPM CONFIGURATION
-sudo cp -a $backup_dir/conf/php-fpm.ini /etc/php5/fpm/conf.d/20-$app.ini
+#=================================================
-# And restart service
-sudo service php5-fpm reload
 
-# Set ssowat config
+ynh_restore_file "/etc/php5/fpm/pool.d/$app.conf"
-if [ "$is_public" = "No" ];
+ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini"
-then
+
-	ynh_app_setting_delete $app skipped_uris
+#=================================================
-fi
+# GENERIC FINALISATION
-sudo yunohost app ssowatconf
+#=================================================
+# RELOAD NGINX AND PHP-FPM
+#=================================================
+
+sudo systemctl reload php5-fpm
+sudo systemctl reload nginx

scripts/upgrade

@@ -1,92 +1,159 @@
 #!/bin/bash
 
-source .fonctions	# Charge les fonctions génériques habituellement utilisées dans le script
+#=================================================
+# GENERIC STARTING
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
 
-# Source app helpers
+source _common.sh
 source /usr/share/yunohost/helpers
 
-# Récupère les infos de l'application.
+#=================================================
+# LOAD SETTINGS
+#=================================================
+
 app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get $app domain)
-path=$(ynh_app_setting_get $app path)
+path_url=$(ynh_app_setting_get $app path)
 admin_wordpress=$(ynh_app_setting_get $app admin)
 language=$(ynh_app_setting_get $app language)
 is_public=$(ynh_app_setting_get $app is_public)
 multisite=$(ynh_app_setting_get $app multisite)
 final_path=$(ynh_app_setting_get $app final_path)
+db_name=$(ynh_app_setting_get $app db_name)
 
-CHECK_PATH	# Vérifie et corrige la syntaxe du path.
+#=================================================
+# FIX OLD THINGS
+#=================================================
 
-# Check if admin is not null
+if [ -z "$admin_wordpress" ]; then
-if [[ "$admin_wordpress" = "" || "$is_public" = "" || "$language" = "" ]]; then
+	ynh_mysql_execute_as_root "select MAX(user_login) from wp_users where user_status=0 INTO OUTFILE '/tmp/wordpressuser';" $db_name
-    echo "Unable to upgrade, please contact support"
-    ynh_die
-fi
-
-root_pwd=$(sudo cat /etc/yunohost/mysql)
-db_name=$app
-if [[ "$admin_wordpress" = "" ]];
-then
-    mysql -u root -p$root_pwd $db_name -e "select MAX(user_login) from wp_users where user_status=0 INTO OUTFILE '/tmp/wordpressuser';"
 	admin_wordpress=$(cat /tmp/wordpressuser)
-    sudo rm -f /tmp/wordpressuser
+	ynh_secure_remove /tmp/wordpressuser
 	ynh_app_setting_set $app admin $admin_wordpress
 fi
 
-if [[ "$final_path" = "" ]];
+if [ -z "$final_path" ]; then
-then
 	final_path=/var/www/$app
 	ynh_app_setting_set $app final_path $final_path
 fi
 
-if [[ "$language" = "" ]];
+if [ -z "$language" ]; then
-then
 	language=$(sudo grep WPLANG $final_path/wp-config.php | cut -d"'" -f4)
 	ynh_app_setting_set $app language $language
 fi
 
-# Copie le fichier de config nginx
+if [ "$is_public" = "Yes" ]; then
-sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
+	ynh_app_setting_set $app is_public 1	# Fixe is_public en booléen
-# Modifie les variables dans le fichier de configuration nginx
+	is_public=1
-sudo sed -i "s@__PATHTOCHANGE__@$path@g" /etc/nginx/conf.d/$domain.d/$app.conf
+elif [ "$is_public" = "No" ]; then
-sudo sed -i "s@__FINALPATH__@$final_path@g" /etc/nginx/conf.d/$domain.d/$app.conf
+	ynh_app_setting_set $app is_public 0
-sudo sed -i "s@__NAMETOCHANGE__@$app@g" /etc/nginx/conf.d/$domain.d/$app.conf
+	is_public=0
+fi
 
-POOL_FPM	# Créer le fichier de configuration du pool php-fpm et le configure.
+if [ "$multisite" = "Yes" ]; then
+	ynh_app_setting_set $app multisite 1	# Fixe multisite en booléen
+	multisite=1
+elif [ "$multisite" = "No" ]; then
+	ynh_app_setting_set $app multisite 0
+	multisite=0
+fi
 
-CHECK_MD5_CONFIG "wp-config.php" "$final_path/wp-config.php"	# Créé un backup du fichier de config si il a été modifié.
+if [ -z $db_name ]; then	# Si db_name n'est pas renseigné dans app setting
-if [ "$multisite" = "Yes" ];
+	db_name=$(ynh_sanitize_dbid $app)
+	ynh_app_setting_set $app db_name $db_name
+fi
+
+#=================================================
+# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+#=================================================
+
+BACKUP_BEFORE_UPGRADE	# Backup the current version of the app
+ynh_clean_setup () {
+	BACKUP_FAIL_UPGRADE	# restore it if the upgrade fails
+}
+ynh_abort_if_errors	# Active trap pour arrêter le script si une erreur est détectée.
+
+#=================================================
+# CHECK THE PATH
+#=================================================
+
+path_url=$(ynh_normalize_url_path $path_url)	# Vérifie et corrige la syntaxe du path.
+
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+
+ynh_nginx_config
+
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+
+ynh_system_user_create $app	# Create the dedicated user, if not exist
+
+#=================================================
+# PHP-FPM CONFIGURATION
+#=================================================
+
+ynh_fpm_config	# Créer le fichier de configuration du pool php-fpm et le configure.
+
+#=================================================
+# SPECIFIC UPGRADE
+#=================================================
+# SAVE THE CONFIG FILE IF IT BEEN MODIFIED
+#=================================================
+ynh_backup_if_checksum_is_different "$final_path/wp-config.php"	# Créé un backup du fichier de config si il a été modifié.
+
+#=================================================
+# CONFIGURE MULTISITE
+#=================================================
+
+if [ $multisite -eq 1 ]
 then
-    sudo sed -i "s@#--MULTISITE--@@g" /etc/nginx/conf.d/$domain.d/$app.conf
+	ynh_replace_string "#--MULTISITE--" "" /etc/nginx/conf.d/$domain.d/$app.conf
 else
-	multisite="No"
+	multisite=0
-	if [ "$is_public" = "No" ];
+	if [ $is_public -eq 0 ]
 	then
-		sudo sed -i "s@#--PRIVATE--@@g" /etc/nginx/conf.d/$domain.d/$app.conf
+		ynh_replace_string "#--PRIVATE--" "" /etc/nginx/conf.d/$domain.d/$app.conf
 	else
-		sudo sed -i "s@//--PUBLIC--define@define@g" $final_path/wp-config.php
+		ynh_replace_string "//--PUBLIC--define" "define" $final_path/wp-config.php
 	fi
 fi
 ynh_app_setting_set $app multisite $multisite
-STORE_MD5_CONFIG "wp-config.php" "$final_path/wp-config.php"	# Réenregistre la somme de contrôle du fichier de config
 
-# Configure les droits d'accès au fichiers
+#=================================================
-# Les fichiers appartiennent à www-data, pour permettre les mises à jour.
+# STORE THE CHECKSUM OF THE CONFIG FILE
-sudo chown -R www-data: $final_path
+#=================================================
+
+ynh_store_file_checksum "$final_path/wp-config.php"	# Réenregistre la somme de contrôle du fichier de config
+
+#=================================================
+# GENERIC FINALISATION
+#=================================================
+# SECURING FILES AND DIRECTORIES
+#=================================================
+
+# Les fichiers appartiennent à l'user wordpress, pour permettre les mises à jour.
+sudo chown -R $app: $final_path
 # Sauf le fichier de config wp-config.php qui appartient à root
 sudo chown root: $final_path/wp-config.php
 
+#=================================================
+# SETUP SSOWAT
+#=================================================
 
 ynh_app_setting_delete $app skipped_uris	# Retire le skipped_uris si il existe encore.
-if [ "$is_public" = "No" ]; then	# Retire l'accès public
+if [ $is_public -eq 0 ]; then	# Retire l'accès public
 	ynh_app_setting_delete $app unprotected_uris
 else	# Ou remplace le skipped_uris par unprotected_uris le cas échéant.
 	ynh_app_setting_set $app unprotected_uris "/"
 fi
-sudo yunohost app ssowatconf
 
+#=================================================
+# RELOAD NGINX
+#=================================================
 
-# Recharge la configuration Nginx
+sudo systemctl reload nginx
-sudo service nginx reload
-# Régénère la configuration de SSOwat
-sudo yunohost app ssowatconf

sources/source_dir

@@ -1 +0,0 @@
-wordpress

sources/source_md5

@@ -1 +0,0 @@
-17f9fe2fa6d14eba86aad152059b5afd  wordpress.tar.gz

sources/source_url

@@ -1 +0,0 @@
-https://wordpress.org/wordpress-4.7.2.tar.gz