Merge pull request #11 from YunoHost-Apps/testing

Upgrade helpers

README.md

@@ -1,6 +1,6 @@
 # Radicale for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/radicale.svg)](https://ci-apps.yunohost.org/jenkins/job/radicale%20%28Community%29/lastBuild/consoleFull)  
+[![Integration level](https://dash.yunohost.org/integration/radicale.svg)](https://dash.yunohost.org/appci/app/radicale)  
 [![Install Radicale with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=radicale)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -17,6 +17,10 @@ Radicale is a small but powerful CalDAV (calendars, todo-lists) and CardDAV (con
 
 ## Screenshots
 
+## Demo
+
+No demo available.
+
 ## Configuration
 
 Use the file `/etc/radicale/config` to change the main configuration of radicale.
@@ -41,7 +45,8 @@ Supported, with LDAP and SSO only with radicale, not for InfCloud.
 #### Supported architectures
 
 * x86-64b - [![Build Status](https://ci-apps.yunohost.org/jenkins/job/radicale%20(Community)/badge/icon)](https://ci-apps.yunohost.org/jenkins/job/radicale%20(Community)/)
-* ARMv8-A - [![Build Status](https://ci-apps.yunohost.org/jenkins/job/radicale%20(Community)%20(%7EARM%7E)/badge/icon)](https://ci-apps.yunohost.org/jenkins/job/radicale%20(Community)%20(%7EARM%7E)/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/jenkins/job/radicale%20(Community)%20(%7EARM%7E)/badge/icon)](https://ci-apps-arm.yunohost.org/jenkins/job/radicale%20(Community)%20(%7EARM%7E)/)
+* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/jenkins/job/radicale%20(Community)/badge/icon)](https://ci-stretch.nohost.me/jenkins/job/radicale%20(Community)/)
 
 ## Limitations
 

README_fr.md

@@ -1,6 +1,6 @@
 # Radicale pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/radicale.svg)](https://ci-apps.yunohost.org/jenkins/job/radicale%20%28Community%29/lastBuild/consoleFull)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/radicale.svg)](https://dash.yunohost.org/appci/app/radicale)  
 [![Installer Radicale avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=radicale)
 
 *[Read this readme in english.](./README.md)*
@@ -17,6 +17,10 @@ Radicale est un petit mais puissant serveur CalDAV (calendriers, listes de tâch
 
 ## Captures d'écran
 
+## Démo
+
+Aucune démo pour cette application.
+
 ## Configuration
 
 Utilisez le fichier `/etc/radicale/config` pour modifier la configuration principale de radicale.
@@ -41,7 +45,8 @@ Supportée, avec LDAP et SSO seulement avec radicale, pas pour InfCloud.
 #### Architectures supportées.
 
 * x86-64b - [![Build Status](https://ci-apps.yunohost.org/jenkins/job/radicale%20(Community)/badge/icon)](https://ci-apps.yunohost.org/jenkins/job/radicale%20(Community)/)
-* ARMv8-A - [![Build Status](https://ci-apps.yunohost.org/jenkins/job/radicale%20(Community)%20(%7EARM%7E)/badge/icon)](https://ci-apps.yunohost.org/jenkins/job/radicale%20(Community)%20(%7EARM%7E)/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/jenkins/job/radicale%20(Community)%20(%7EARM%7E)/badge/icon)](https://ci-apps-arm.yunohost.org/jenkins/job/radicale%20(Community)%20(%7EARM%7E)/)
+* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/jenkins/job/radicale%20(Community)/badge/icon)](https://ci-stretch.nohost.me/jenkins/job/radicale%20(Community)/)
 
 ## Limitations
 

conf/nginx.conf

@@ -25,7 +25,7 @@ location @radicale {
 	uwsgi_param  SERVER_NAME        $server_name;
 }
 
-#INFCLOUD#location __PATH_NO_ROOT__/infcloud {
+#INFCLOUD#location __PATH__/infcloud {
 #INFCLOUD#	alias __FINALPATH__/infcloud;
 #INFCLOUD#	if ($scheme = http) {
 #INFCLOUD#		rewrite ^ https://$server_name$request_uri? permanent;

manifest.json

@@ -6,7 +6,7 @@
 		"en": "CalDAV (calendar) and CardDAV (contact) synchronization server",
 		"fr": "Serveur de synchronisation CalDAV et CardDAV"
 	},
-	"version": "1.1.6~ynh2",
+	"version": "1.1.6~ynh3",
 	"url": "http://radicale.org",
 	"license": "GPL-3.0,AGPL-3.0",
 	"maintainer": {
@@ -14,7 +14,7 @@
 		"email": "maniackc_dev@crudelis.fr"
 	},
 	"requirements": {
-        "yunohost": ">= 2.7.2"
+		"yunohost": ">= 2.7.14"
 	},
 	"multi_instance": false,
 	"services": [

scripts/_common.sh

@@ -26,186 +26,203 @@ CHECK_SIZE () {	# Vérifie avant chaque backup que l'espace est suffisant
 # PACKAGE CHECK BYPASSING...
 #=================================================
 
-IS_PACKAGE_CHECK () {	# Détermine une exécution en conteneur (Non testé)
+IS_PACKAGE_CHECK () {
-	return $(uname -n | grep -c 'pchecker_lxc')
+	return $(env | grep -c container=lxc)
 }
 
 #=================================================
 # EXPERIMENTAL HELPERS
 #=================================================
 
-# INFOS
+# Internal helper design to allow helpers to use getopts to manage their arguments
-# 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
+# example: function my_helper()
-# 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
+#     declare -Ar args_array=( [a]=arg1= [b]=arg2= [c]=arg3 )
-# 3 variables sont mises à disposition, et 2 sont stockées dans la config de l'app
+#     local arg1
-# - nodejs_path: Le chemin absolu de cette version de node
+#     local arg2
-# Utilisé pour des appels directs à node.
+#     local arg3
-# - nodejs_version: Simplement le numéro de version de nodejs pour cette application
+#     ynh_handle_getopts_args "$@"
-# - 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.
+# }
-
+# my_helper --arg1 "val1" -b val2 -c
-n_install_dir="/opt/node_n"
+#
-node_version_path="/opt/node_n/n/versions/node"
+# usage: ynh_handle_getopts_args "$@"
-# N_PREFIX est le dossier de n, il doit être chargé dans les variables d'environnement pour n.
+# | arg: $@    - Simply "$@" to tranfert all the positionnal arguments to the function
-export N_PREFIX="$n_install_dir"
+#
-
+# This helper need an array, named "args_array" with all the arguments used by the helper
-ynh_install_n () {
+# 	that want to use ynh_handle_getopts_args
-	echo "Installation of N - Node.js version management" >&2
+# Be carreful, this array has to be an associative array, as the following example:
-	# Build an app.src for n
+# declare -Ar args_array=( [a]=arg1 [b]=arg2= [c]=arg3 )
-	mkdir -p "../conf"
+# Let's explain this array:
-	echo "SOURCE_URL=https://github.com/tj/n/archive/v2.1.7.tar.gz
+# a, b and c are short options, -a, -b and -c
-SOURCE_SUM=2ba3c9d4dd3c7e38885b37e02337906a1ee91febe6d5c9159d89a9050f2eea8f" > "../conf/n.src"
+# arg1, arg2 and arg3 are the long options associated to the previous short ones. --arg1, --arg2 and --arg3
-	# Download and extract n
+# For each option, a short and long version has to be defined.
-	ynh_setup_source "$n_install_dir/git" n
+# Let's see something more significant
-	# Install n
+# declare -Ar args_array=( [u]=user [f]=finalpath= [d]=database )
-	(cd "$n_install_dir/git"
+#
-	PREFIX=$N_PREFIX make install 2>&1)
+# NB: Because we're using 'declare' without -g, the array will be declared as a local variable.
-}
+#
-
+# Please keep in mind that the long option will be used as a variable to store the values for this option.
-ynh_use_nodejs () {
+# For the previous example, that means that $finalpath will be fill with the value given as argument for this option.
-	nodejs_version=$(ynh_app_setting_get $app nodejs_version)
+#
-
+# Also, in the previous example, finalpath has a '=' at the end. That means this option need a value.
-	load_n_path="[[ :$PATH: == *\":$n_install_dir/bin:\"* ]] || PATH=\"$n_install_dir/bin:$PATH\"; N_PREFIX="$n_install_dir""
+# So, the helper has to be call with --finalpath /final/path, --finalpath=/final/path or -f /final/path, the variable $finalpath will get the value /final/path
-
+# If there's many values for an option, -f /final /path, the value will be separated by a ';' $finalpath=/final;/path
-	nodejs_use_version="$n_install_dir/bin/n -q $nodejs_version"
+# For an option without value, like --user in the example, the helper can be called only with --user or -u. $user will then get the value 1.
-
+#
-	# "Load" a version of node
+# To keep a retrocompatibility, a package can still call a helper, using getopts, with positional arguments.
-	eval $load_n_path; $nodejs_use_version
+# The "legacy mode" will manage the positional arguments and fill the variable in the same order than they are given in $args_array.
-
+# e.g. for `my_helper "val1" val2`, arg1 will be filled with val1, and arg2 with val2.
-	# Get the absolute path of this version of node
+ynh_handle_getopts_args () {
-	nodejs_path="$(n bin $nodejs_version)"
+	# Manage arguments only if there's some provided
-
+	set +x
-	# Make an alias for node use
+	if [ $# -ne 0 ]
-	ynh_node_exec="eval $load_n_path; n use $nodejs_version"
-}
-
-ynh_install_nodejs () {
-	# Use n, https://github.com/tj/n to manage the nodejs versions
-	nodejs_version="$1"
-	local n_install_script="https://git.io/n-install"
-
-	# Create $n_install_dir
-	mkdir -p "$n_install_dir"
-
-	# Load n path in PATH
-	CLEAR_PATH="$n_install_dir/bin:$PATH"
-	# Remove /usr/local/bin in PATH in case of node has already setup.
-	PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@')
-
-	# Move an existing node binary, to avoid to block n.
-	test -x /usr/bin/node && mv /usr/bin/node /usr/bin/node_n
-	test -x /usr/bin/npm && mv /usr/bin/npm /usr/bin/npm_n
-
-	# If n is not previously setup, install it
-	if ! test n --version > /dev/null 2>&1
 	then
-		ynh_install_n
+		# Store arguments in an array to keep each argument separated
+		local arguments=("$@")
+
+		# For each option in the array, reduce to short options for getopts (e.g. for [u]=user, --user will be -u)
+		# And built parameters string for getopts
+		# ${!args_array[@]} is the list of all keys in the array (A key is 'u' in [u]=user, user is a value)
+		local getopts_parameters=""
+		local key=""
+		for key in "${!args_array[@]}"
+		do
+			# Concatenate each keys of the array to build the string of arguments for getopts
+			# Will looks like 'abcd' for -a -b -c -d
+			# If the value of a key finish by =, it's an option with additionnal values. (e.g. --user bob or -u bob)
+			# Check the last character of the value associate to the key
+			if [ "${args_array[$key]: -1}" = "=" ]
+			then
+				# For an option with additionnal values, add a ':' after the letter for getopts.
+				getopts_parameters="${getopts_parameters}${key}:"
+			else
+				getopts_parameters="${getopts_parameters}${key}"
+			fi
+			# Check each argument given to the function
+			local arg=""
+			# ${#arguments[@]} is the size of the array
+			for arg in `seq 0 $(( ${#arguments[@]} - 1 ))`
+			do
+				# And replace long option (value of the key) by the short option, the key itself
+				# (e.g. for [u]=user, --user will be -u)
+				# Replace long option with =
+				arguments[arg]="${arguments[arg]//--${args_array[$key]}/-${key} }"
+				# And long option without =
+				arguments[arg]="${arguments[arg]//--${args_array[$key]%=}/-${key}}"
+			done
+		done
+
+		# Read and parse all the arguments
+		# Use a function here, to use standart arguments $@ and be able to use shift.
+		parse_arg () {
+			# Read all arguments, until no arguments are left
+			while [ $# -ne 0 ]
+			do
+				# Initialize the index of getopts
+				OPTIND=1
+				# Parse with getopts only if the argument begin by -, that means the argument is an option
+				# getopts will fill $parameter with the letter of the option it has read.
+				local parameter=""
+				getopts ":$getopts_parameters" parameter || true
+
+				if [ "$parameter" = "?" ]
+				then
+					ynh_die "Invalid argument: -${OPTARG:-}"
+				elif [ "$parameter" = ":" ]
+				then
+					ynh_die "-$OPTARG parameter requires an argument."
+				else
+					local shift_value=1
+					# Use the long option, corresponding to the short option read by getopts, as a variable
+					# (e.g. for [u]=user, 'user' will be used as a variable)
+					# Also, remove '=' at the end of the long option
+					# The variable name will be stored in 'option_var'
+					local option_var="${args_array[$parameter]%=}"
+					# If this option doesn't take values
+					# if there's a '=' at the end of the long option name, this option takes values
+					if [ "${args_array[$parameter]: -1}" != "=" ]
+					then
+						# 'eval ${option_var}' will use the content of 'option_var'
+						eval ${option_var}=1
+					else
+						# Read all other arguments to find multiple value for this option.
+						# Load args in a array
+						local all_args=("$@")
+
+						# If the first argument is longer than 2 characters,
+						# There's a value attached to the option, in the same array cell
+						if [ ${#all_args[0]} -gt 2 ]; then
+							# Remove the option and the space, so keep only the value itself.
+							all_args[0]="${all_args[0]#-${parameter} }"
+							# Reduce the value of shift, because the option has been removed manually
+							shift_value=$(( shift_value - 1 ))
+						fi
+
+						# Then read the array value per value
+						for i in `seq 0 $(( ${#all_args[@]} - 1 ))`
+						do
+							# If this argument is an option, end here.
+							if [ "${all_args[$i]:0:1}" == "-" ] || [ -z "${all_args[$i]}" ]
+							then
+								# Ignore the first value of the array, which is the option itself
+								if [ "$i" -ne 0 ]; then
+									break
+								fi
+							else
+								# Declare the content of option_var as a variable.
+								eval ${option_var}=""
+								# Else, add this value to this option
+								# Each value will be separated by ';'
+								if [ -n "${!option_var}" ]
+								then
+									# If there's already another value for this option, add a ; before adding the new value
+									eval ${option_var}+="\;"
+								fi
+								eval ${option_var}+=\"${all_args[$i]}\"
+								shift_value=$(( shift_value + 1 ))
+							fi
+						done
+					fi
+				fi
+
+				# Shift the parameter and its argument(s)
+				shift $shift_value
+			done
+		}
+
+		# LEGACY MODE
+		# Check if there's getopts arguments
+		if [ "${arguments[0]:0:1}" != "-" ]
+		then
+			# If not, enter in legacy mode and manage the arguments as positionnal ones.
+			echo "! Helper used in legacy mode !"
+			for i in `seq 0 $(( ${#arguments[@]} -1 ))`
+			do
+				# Use getopts_parameters as a list of key of the array args_array
+				# Remove all ':' in getopts_parameters
+				getopts_parameters=${getopts_parameters//:}
+				# Get the key from getopts_parameters, by using the key according to the position of the argument.
+				key=${getopts_parameters:$i:1}
+				# Use the long option, corresponding to the key, as a variable
+				# (e.g. for [u]=user, 'user' will be used as a variable)
+				# Also, remove '=' at the end of the long option
+				# The variable name will be stored in 'option_var'
+				local option_var="${args_array[$key]%=}"
+
+				# Store each value given as argument in the corresponding variable
+				# The values will be stored in the same order than $args_array
+				eval ${option_var}+=\"${arguments[$i]}\"
+			done
+		else
+			# END LEGACY MODE
+			# Call parse_arg and pass the modified list of args as an array of arguments.
+			parse_arg "${arguments[@]}"
+		fi
 	fi
-
+	set -x
-	# Modify the default N_PREFIX in n script
-	ynh_replace_string "^N_PREFIX=\${N_PREFIX-.*}$" "N_PREFIX=\${N_PREFIX-$N_PREFIX}" "$n_install_dir/bin/n"
-
-	# Restore /usr/local/bin in PATH
-	PATH=$CLEAR_PATH
-
-	# And replace the old node binary.
-	test -x /usr/bin/node_n && mv /usr/bin/node_n /usr/bin/node
-	test -x /usr/bin/npm_n && mv /usr/bin/npm_n /usr/bin/npm
-
-	# Install the requested version of nodejs
-	n $nodejs_version
-
-	# Find the last "real" version for this major version of node.
-	real_nodejs_version=$(find $node_version_path/$nodejs_version* -maxdepth 0 | sort --version-sort | tail --lines=1)
-	real_nodejs_version=$(basename $real_nodejs_version)
-
-	# Create a symbolic link for this major version. If the file doesn't already exist
-	if [ ! -e "$node_version_path/$nodejs_version" ]
-	then
-		ln --symbolic --force --no-target-directory $node_version_path/$real_nodejs_version $node_version_path/$nodejs_version
-	fi
-
-	# Store the ID of this app and the version of node requested for it
-	echo "$YNH_APP_ID:$nodejs_version" | 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
-
-	# Build the update script and set the cronjob
-	ynh_cron_upgrade_node
-
-	ynh_use_nodejs
-}
-
-ynh_remove_nodejs () {
-	ynh_use_nodejs
-
-	# Remove the line for this app
-	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"
-		ynh_secure_remove "/usr/local/n"
-		sed --in-place "/N_PREFIX/d" /root/.bashrc
-	fi
-}
-
-ynh_cron_upgrade_node () {
-	# Build the update script
-	cat > "$n_install_dir/node_update.sh" << EOF
-#!/bin/bash
-
-version_path="$node_version_path"
-n_install_dir="$n_install_dir"
-
-# Log the date
-date
-
-# List all real installed version of node
-all_real_version="\$(find \$version_path/* -maxdepth 0 -type d | sed "s@\$version_path/@@g")"
-
-# Keep only the major version number of each line
-all_real_version=\$(echo "\$all_real_version" | sed 's/\..*\$//')
-
-# Remove double entries
-all_real_version=\$(echo "\$all_real_version" | sort --unique)
-
-# Read each major version
-while read version
-do
-	echo "Update of the version \$version"
-	sudo \$n_install_dir/bin/n \$version
-
-	# Find the last "real" version for this major version of node.
-	real_nodejs_version=\$(find \$version_path/\$version* -maxdepth 0 | sort --version-sort | tail --lines=1)
-	real_nodejs_version=\$(basename \$real_nodejs_version)
-
-	# Update the symbolic link for this version
-	sudo ln --symbolic --force --no-target-directory \$version_path/\$real_nodejs_version \$version_path/\$version
-done <<< "\$(echo "\$all_real_version")"
-EOF
-
-	chmod +x "$n_install_dir/node_update.sh"
-
-	# Build the cronjob
-	cat > "/etc/cron.daily/node_update" << EOF
-#!/bin/bash
-
-$n_install_dir/node_update.sh >> $n_install_dir/node_update.log
-EOF
-
-	chmod +x "/etc/cron.daily/node_update"
 }
 
 #=================================================
@@ -214,36 +231,44 @@ EOF
 #
 # usage: ynh_check_starting "Line to match" [Log file] [Timeout] [Service name]
 #
-# | arg: Line to match - The line to find in the log to attest the service have finished to boot.
+# | arg: -m, --line_to_match= - Line to match - The line to find in the log to attest the service have finished to boot.
-# | arg: Log file - The log file to watch
+# | arg: -l, --app_log= - Log file - The log file to watch; specify "systemd" to read systemd journal for specified service
-# | arg: Service name
+#    /var/log/$app/$app.log will be used if no other log is defined.
-# /var/log/$app/$app.log will be used if no other log is defined.
+# | arg: -t, --timeout= - Timeout - The maximum time to wait before ending the watching. Defaut 300 seconds.
-# | arg: Timeout - The maximum time to wait before ending the watching. Defaut 300 seconds.
+# | arg: -n, --service_name= - Service name
-ynh_check_starting () {
-	local line_to_match="$1"
-	local service_name="${4:-$app}"
-	local app_log="${2:-/var/log/$service_name/$service_name.log}"
-	local timeout=${3:-300}
 
-	ynh_clean_check_starting () {
+ynh_check_starting () {
-		# Stop the execution of tail.
+	# Declare an array to define the options of this helper.
-		kill -s 15 $pid_tail 2>&1
+	declare -Ar args_array=( [m]=line_to_match= [l]=app_log= [t]=timeout= [n]=service_name= )
-		ynh_secure_remove "$templog" 2>&1
+	local line_to_match
-	}
+	local app_log
+	local timeout
+	local service_name
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+	local app_log="${app_log:-/var/log/$service_name/$service_name.log}"
+	local timeout=${timeout:-300}
+	local service_name="${service_name:-$app}"
 
 	echo "Starting of $service_name" >&2
 	systemctl stop $service_name
 	local templog="$(mktemp)"
 	# Following the starting of the app in its log
-	tail -F -n0 "$app_log" > "$templog" &
+	if [ "$app_log" == "systemd" ] ; then
-	# Get the PID of the tail command
+		# Read the systemd journal
+		journalctl -u $service_name -f --since=-45 > "$templog" &
+	else
+		# Read the specified log file
+		tail -F -n0 "$app_log" > "$templog" &
+	fi
+	# Get the PID of the last command
 	local pid_tail=$!
 	systemctl start $service_name
 
 	local i=0
 	for i in `seq 1 $timeout`
 	do
-		# Read the log until the sentence is found, that means the app finished to start. Or run until the timeout
+		# Read the log until the sentence is found, which means the app finished starting. Or run until the timeout.
 		if grep --quiet "$line_to_match" "$templog"
 		then
 			echo "The service $service_name has correctly started." >&2
@@ -254,13 +279,23 @@ ynh_check_starting () {
 	done
 	if [ $i -eq $timeout ]
 	then
-		echo "The service $service_name didn't fully started before the timeout." >&2
+		echo "The service $service_name didn't fully start before the timeout." >&2
 	fi
 
 	echo ""
 	ynh_clean_check_starting
 }
 
+# Clean temporary process and file used by ynh_check_starting
+# (usually used in ynh_clean_setup scripts)
+#
+# usage: ynh_clean_check_starting
+ynh_clean_check_starting () {
+	# Stop the execution of tail.
+	kill -s 15 $pid_tail 2>&1
+	ynh_secure_remove "$templog" 2>&1
+}
+
 #=================================================
 
 ynh_print_log () {
@@ -369,9 +404,20 @@ ynh_print_ON () {
 #
 # usage: ynh_multimedia_build_main_dir
 ynh_multimedia_build_main_dir () {
-	wget -nv https://github.com/YunoHost-Apps/yunohost.multimedia/archive/master.zip 2>&1
+        local ynh_media_release="v1.0"
-	unzip -q master.zip
+        local checksum="4852c8607db820ad51f348da0dcf0c88"
-	./yunohost.multimedia-master/script/ynh_media_build.sh
+
+        # Download yunohost.multimedia scripts
+        wget -nv https://github.com/YunoHost-Apps/yunohost.multimedia/archive/${ynh_media_release}.tar.gz 
+
+        # Check the control sum
+        echo "${checksum} ${ynh_media_release}.tar.gz" | md5sum -c --status \
+                || ynh_die "Corrupt source"
+
+        # Extract
+        mkdir yunohost.multimedia-master
+        tar -xf ${ynh_media_release}.tar.gz -C yunohost.multimedia-master --strip-components 1
+        ./yunohost.multimedia-master/script/ynh_media_build.sh
 }
 
 # Add a directory in yunohost.multimedia
@@ -379,11 +425,16 @@ ynh_multimedia_build_main_dir () {
 #
 # usage: ynh_multimedia_addfolder "Source directory" "Destination directory"
 #
-# | arg: Source directory - The real directory which contains your medias.
+# | arg: -s, --source_dir= - Source directory - The real directory which contains your medias.
-# | arg: Destination directory - The name and the place of the symbolic link, relative to "/home/yunohost.multimedia"
+# | arg: -d, --dest_dir= - Destination directory - The name and the place of the symbolic link, relative to "/home/yunohost.multimedia"
 ynh_multimedia_addfolder () {
-	local source_dir="$1"
+	# Declare an array to define the options of this helper.
-	local dest_dir="$2"
+	declare -Ar args_array=( [s]=source_dir= [d]=dest_dir= )
+	local source_dir
+	local dest_dir
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+
 	./yunohost.multimedia-master/script/ynh_media_addfolder.sh --source="$source_dir" --dest="$dest_dir"
 }
 
@@ -391,13 +442,18 @@ ynh_multimedia_addfolder () {
 #
 # usage: ynh_multimedia_movefolder "Source directory" "Destination directory"
 #
-# | arg: Source directory - The real directory which contains your medias.
+# | arg: -s, --source_dir= - Source directory - The real directory which contains your medias.
 # It will be moved to "Destination directory"
 # A symbolic link will replace it.
-# | arg: Destination directory - The new name and place of the directory, relative to "/home/yunohost.multimedia"
+# | arg: -d, --dest_dir= - Destination directory - The new name and place of the directory, relative to "/home/yunohost.multimedia"
 ynh_multimedia_movefolder () {
-	local source_dir="$1"
+	# Declare an array to define the options of this helper.
-	local dest_dir="$2"
+	declare -Ar args_array=( [s]=source_dir= [d]=dest_dir= )
+	local source_dir
+	local dest_dir
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+
 	./yunohost.multimedia-master/script/ynh_media_addfolder.sh --inv --source="$source_dir" --dest="$dest_dir"
 }
 
@@ -405,9 +461,14 @@ ynh_multimedia_movefolder () {
 #
 # usage: ynh_multimedia_addaccess user_name
 #
-# | arg: user_name - The name of the user which gain this access.
+# | arg: -u, --user_name= - The name of the user which gain this access.
 ynh_multimedia_addaccess () {
-	local user_name=$1
+	# Declare an array to define the options of this helper.
+	declare -Ar args_array=( [u]=user_name=)
+	local user_name
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+
 	groupadd -f multimedia
 	usermod -a -G multimedia $user_name
 }
@@ -427,15 +488,15 @@ ynh_add_fail2ban_config () {
    failregex=$2
    max_retry=${3:-3}
    ports=${4:-http,https}
-   
+
   test -n "$logpath" || ynh_die "ynh_add_fail2ban_config expects a logfile path as first argument and received nothing."
   test -n "$failregex" || ynh_die "ynh_add_fail2ban_config expects a failure regex as second argument and received nothing."
-  
+
   finalfail2banjailconf="/etc/fail2ban/jail.d/$app.conf"
   finalfail2banfilterconf="/etc/fail2ban/filter.d/$app.conf"
   ynh_backup_if_checksum_is_different "$finalfail2banjailconf" 1
   ynh_backup_if_checksum_is_different "$finalfail2banfilterconf" 1
-  
+
   sudo tee $finalfail2banjailconf <<EOF
 [$app]
 enabled = true
@@ -455,8 +516,8 @@ EOF
 
   ynh_store_file_checksum "$finalfail2banjailconf"
   ynh_store_file_checksum "$finalfail2banfilterconf"
-  
+
-  systemctl restart fail2ban
+  systemctl reload fail2ban
   local fail2ban_error="$(journalctl -u fail2ban | tail -n50 | grep "WARNING.*$app.*")"
   if [ -n "$fail2ban_error" ]
   then
@@ -471,7 +532,7 @@ EOF
 ynh_remove_fail2ban_config () {
   ynh_secure_remove "/etc/fail2ban/jail.d/$app.conf"
   ynh_secure_remove "/etc/fail2ban/filter.d/$app.conf"
-  sudo systemctl restart fail2ban
+  systemctl reload fail2ban
 }
 
 #=================================================
@@ -487,35 +548,82 @@ ynh_read_manifest () {
 	python3 -c "import sys, json;print(json.load(open('$manifest', encoding='utf-8'))['$key'])"
 }
 
-# Exit without error if the package is up to date
+# Read the upstream version from the manifest
+# The version number in the manifest is defined by <upstreamversion>~ynh<packageversion>
+# For example : 4.3-2~ynh3
+# This include the number before ~ynh
+# In the last example it return 4.3-2
 #
-# This helper should be used to avoid an upgrade of a package
+# usage: ynh_app_upstream_version
-# when it's not needed.
+ynh_app_upstream_version () {
+    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_key=$(ynh_read_manifest "$manifest_path" "version")
+    echo "${version_key/~ynh*/}"
+}
+
+
+# Read package version from the manifest
+# The version number in the manifest is defined by <upstreamversion>~ynh<packageversion>
+# For example : 4.3-2~ynh3
+# This include the number after ~ynh
+# In the last example it return 3
+#
+# usage: ynh_app_package_version
+ynh_app_package_version () {
+    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_key=$(ynh_read_manifest "$manifest_path" "version")
+    echo "${version_key/*~ynh/}"
+}
+
+# Checks the app version to upgrade with the existing app version and returns:
+# - UPGRADE_APP if the upstream app version has changed
+# - UPGRADE_PACKAGE if only the YunoHost package has changed
+#
+## It stops the current script without error if the package is up-to-date
+#
+# This helper should be used to avoid an upgrade of an app, or the upstream part
+# of it, when it's not needed
 #
 # To force an upgrade, even if the package is up to date,
 # you have to set the variable YNH_FORCE_UPGRADE before.
 # example: sudo YNH_FORCE_UPGRADE=1 yunohost app upgrade MyApp
-#
-# usage: ynh_abort_if_up_to_date
-ynh_abort_if_up_to_date () {
-	local force_upgrade=${YNH_FORCE_UPGRADE:-0}
-	local package_check=${PACKAGE_CHECK_EXEC:-0}
 
-	local version=$(ynh_read_manifest "/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" "version" || echo 1.0)
+# usage: ynh_check_app_version_changed
-	local last_version=$(ynh_read_manifest "../manifest.json" "version" || echo 1.0)
+ynh_check_app_version_changed () {
-	if [ "$version" = "$last_version" ]
+  local force_upgrade=${YNH_FORCE_UPGRADE:-0}
-	then
+  local package_check=${PACKAGE_CHECK_EXEC:-0}
-		if [ "$force_upgrade" != "0" ]
+
-		then
+  # By default, upstream app version has changed
-			echo "Upgrade forced by YNH_FORCE_UPGRADE." >&2
+  local return_value="UPGRADE_APP"
-			unset YNH_FORCE_UPGRADE
+
-		elif [ "$package_check" != "0" ]
+  local current_version=$(ynh_read_manifest "/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" "version" || echo 1.0)
-		then
+  local current_upstream_version="${current_version/~ynh*/}"
-			echo "Upgrade forced for package check." >&2
+  local update_version=$(ynh_read_manifest "../manifest.json" "version" || echo 1.0)
-		else
+  local update_upstream_version="${update_version/~ynh*/}"
-			ynh_die "Up-to-date, nothing to do" 0
+
-		fi
+  if [ "$current_version" == "$update_version" ] ; then
-	fi
+      # Complete versions are the same
+      if [ "$force_upgrade" != "0" ]
+      then
+        echo "Upgrade forced by YNH_FORCE_UPGRADE." >&2
+        unset YNH_FORCE_UPGRADE
+      elif [ "$package_check" != "0" ]
+      then
+        echo "Upgrade forced for package check." >&2
+      else
+        ynh_die "Up-to-date, nothing to do" 0
+      fi
+  elif [ "$current_upstream_version" == "$update_upstream_version" ] ; then
+    # Upstream versions are the same, only YunoHost package versions differ
+    return_value="UPGRADE_PACKAGE"
+  fi
+  echo $return_value
 }
 
 #=================================================
@@ -523,14 +631,20 @@ ynh_abort_if_up_to_date () {
 # Send an email to inform the administrator
 #
 # usage: ynh_send_readme_to_admin app_message [recipients]
-# | arg: app_message - The message to send to the administrator.
+# | arg: -m --app_message= - The message to send to the administrator.
-# | arg: recipients - The recipients of this email. Use spaces to separate multiples recipients. - default: root
+# | arg: -r, --recipients= - The recipients of this email. Use spaces to separate multiples recipients. - default: root
 #	example: "root admin@domain"
 #	If you give the name of a YunoHost user, ynh_send_readme_to_admin will find its email adress for you
 #	example: "root admin@domain user1 user2"
 ynh_send_readme_to_admin() {
-	local app_message="${1:-...No specific information...}"
+	# Declare an array to define the options of this helper.
-	local recipients="${2:-root}"
+	declare -Ar args_array=( [m]=app_message= [r]=recipients= )
+	local app_message
+	local recipients
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+	local app_message="${app_message:-...No specific information...}"
+	local recipients="${recipients:-root}"
 
 	# Retrieve the email of users
 	find_mails () {
@@ -569,8 +683,16 @@ Automatic diagnosis data from YunoHost
 
 $(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')"
 
+	# Define binary to use for mail command
+	if [ -e /usr/bin/bsd-mailx ]
+	then
+		local mail_bin=/usr/bin/bsd-mailx
+	else
+		local mail_bin=/usr/bin/mail.mailutils
+	fi
+
 	# Send the email to the recipients
-	echo "$mail_message" | mail -a "Content-Type: text/plain; charset=UTF-8" -s "$mail_subject" "$recipients"
+	echo "$mail_message" | $mail_bin -a "Content-Type: text/plain; charset=UTF-8" -s "$mail_subject" "$recipients"
 }
 
 #=================================================
@@ -578,11 +700,16 @@ $(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')"
 # Reload (or other actions) a service and print a log in case of failure.
 #
 # usage: ynh_system_reload service_name [action]
-# | arg: service_name - Name of the service to reload
+# | arg: -n, --service_name= - Name of the service to reload
-# | arg: action - Action to perform with systemctl. Default: reload
+# | arg: -a, --action= - Action to perform with systemctl. Default: reload
 ynh_system_reload () {
-        local service_name=$1
+        # Declare an array to define the options of this helper.
-        local action=${2:-reload}
+        declare -Ar args_array=( [n]=service_name= [a]=action= )
+        local service_name
+        local action
+        # Manage arguments with getopts
+        ynh_handle_getopts_args "$@"
+        local action=${action:-reload}
 
         # Reload, restart or start and print the log if the service fail to start or reload
         systemctl $action $service_name || ( journalctl --lines=20 -u $service_name >&2 && false)
@@ -612,8 +739,6 @@ is_jessie () {
 	fi
 }
 
-#=================================================
-#============= FUTURE YUNOHOST HELPER ============
 #=================================================
 
 # Delete a file checksum from the app settings
@@ -626,3 +751,82 @@ ynh_delete_file_checksum () {
 	local checksum_setting_name=checksum_${1//[\/ ]/_}	# Replace all '/' and ' ' by '_'
 	ynh_app_setting_delete $app $checksum_setting_name
 }
+
+#=================================================
+
+ynh_maintenance_mode_ON () {
+	# Load value of $path_url and $domain from the config if their not set
+	if [ -z $path_url ]; then
+		path_url=$(ynh_app_setting_get $app path)
+	fi
+	if [ -z $domain ]; then
+		domain=$(ynh_app_setting_get $app domain)
+	fi
+
+	# Create an html to serve as maintenance notice
+	echo "<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="refresh" content="3">
+<title>Your app $app is currently under maintenance!</title>
+<style>
+	body {
+		width: 70em;
+		margin: 0 auto;
+	}
+</style>
+</head>
+<body>
+<h1>Your app $app is currently under maintenance!</h1>
+<p>This app has been put under maintenance by your administrator at $(date)</p>
+<p>Please wait until the maintenance operation is done. This page will be reloaded as soon as your app will be back.</p>
+
+</body>
+</html>" > "/var/www/html/maintenance.$app.html"
+
+	# Create a new nginx config file to redirect all access to the app to the maintenance notice instead.
+	echo "# All request to the app will be redirected to ${path_url}_maintenance and fall on the maintenance notice
+rewrite ^${path_url}/(.*)$ ${path_url}_maintenance/? redirect;
+# Use another location, to not be in conflict with the original config file
+location ${path_url}_maintenance/ {
+alias /var/www/html/ ;
+
+try_files maintenance.$app.html =503;
+
+# Include SSOWAT user panel.
+include conf.d/yunohost_panel.conf.inc;
+}" > "/etc/nginx/conf.d/$domain.d/maintenance.$app.conf"
+
+	# The current config file will redirect all requests to the root of the app.
+	# To keep the full path, we can use the following rewrite rule:
+	# 	rewrite ^${path_url}/(.*)$ ${path_url}_maintenance/\$1? redirect;
+	# The difference will be in the $1 at the end, which keep the following queries.
+	# But, if it works perfectly for a html request, there's an issue with any php files.
+	# This files are treated as simple files, and will be downloaded by the browser.
+	# Would be really be nice to be able to fix that issue. So that, when the page is reloaded after the maintenance, the user will be redirected to the real page he was.
+
+	systemctl reload nginx
+}
+
+ynh_maintenance_mode_OFF () {
+	# Load value of $path_url and $domain from the config if their not set
+	if [ -z $path_url ]; then
+		path_url=$(ynh_app_setting_get $app path)
+	fi
+	if [ -z $domain ]; then
+		domain=$(ynh_app_setting_get $app domain)
+	fi
+
+	# Rewrite the nginx config file to redirect from ${path_url}_maintenance to the real url of the app.
+	echo "rewrite ^${path_url}_maintenance/(.*)$ ${path_url}/\$1 redirect;" > "/etc/nginx/conf.d/$domain.d/maintenance.$app.conf"
+	systemctl reload nginx
+
+	# Sleep 4 seconds to let the browser reload the pages and redirect the user to the app.
+	sleep 4
+
+	# Then remove the temporary files used for the maintenance.
+	rm "/var/www/html/maintenance.$app.html"
+	rm "/etc/nginx/conf.d/$domain.d/maintenance.$app.conf"
+
+	systemctl reload nginx
+}

scripts/backup

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

scripts/change_url

@@ -43,6 +43,14 @@ test -n "$new_path" || new_path="/"
 new_path=$(ynh_normalize_url_path $new_path)
 old_path=$(ynh_normalize_url_path $old_path)
 
+#=================================================
+# ACTIVATE MAINTENANCE MODE
+#=================================================
+
+path_url=$old_path
+domain=$old_domain
+ynh_maintenance_mode_ON
+
 #=================================================
 # CHECK WHICH PARTS SHOULD BE CHANGED
 #=================================================
@@ -80,11 +88,15 @@ then
 	# Make a backup of the original nginx config file if modified
 	ynh_backup_if_checksum_is_different "$nginx_conf_path"
 
-	ynh_replace_string "location $old_path {" "location $new_path {" "$nginx_conf_path"
+	# Set global variables for nginx helper
-	ynh_replace_string "location ${old_path%/}/infcloud {" "location ${new_path%/}/infcloud {" "$nginx_conf_path"
+	domain="$old_domain"
+	path_url="$new_path"
 
-	# Calculate and store the nginx config file checksum
+	# Store path_url setting
-	ynh_store_file_checksum "$nginx_conf_path"
+	ynh_app_setting_set $app path_url "$path_url"
+
+	# Create a dedicated nginx config
+	ynh_add_nginx_config
 fi
 
 # Change the domain for nginx
@@ -94,9 +106,8 @@ then
 	ynh_delete_file_checksum "$nginx_conf_path"
 	mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
 
-	nginx_conf_path=/etc/nginx/conf.d/$new_domain.d/$app.conf
+	# Store file checksum for the new config file location
-	# Calculate and store the nginx config file checksum
+	ynh_store_file_checksum "/etc/nginx/conf.d/$new_domain.d/$app.conf"
-	ynh_store_file_checksum "$nginx_conf_path"
 fi
 
 #=================================================
@@ -126,7 +137,7 @@ fi
 # RESTART UWSGI
 #=================================================
 
-ynh_system_reload uwsgi restart
+ynh_system_reload --service_name=uwsgi --action=restart
 
 #=================================================
 # GENERIC FINALISATION
@@ -134,4 +145,4 @@ ynh_system_reload uwsgi restart
 # RELOAD NGINX
 #=================================================
 
-ynh_system_reload nginx
+ynh_system_reload --service_name=nginx

scripts/install

@@ -69,12 +69,6 @@ ynh_install_app_dependencies $app_depencencies
 #=================================================
 
 ynh_add_nginx_config
-if [ "$path_url" = "/" ]
-then
-	ynh_replace_string "__PATH_NO_ROOT__" "" /etc/nginx/conf.d/$domain.d/$app.conf
-else
-	ynh_replace_string "__PATH_NO_ROOT__" "$path_url" /etc/nginx/conf.d/$domain.d/$app.conf
-fi
 if [ $infcloud -eq 1 ]
 then	# Ajoute InfCloud dans la config Nginx
 	ynh_replace_string "#INFCLOUD#" "" /etc/nginx/conf.d/$domain.d/$app.conf
@@ -222,7 +216,7 @@ done <<< "$(yunohost user list | grep username | cut -d ":" -f 2 | cut -c 2-)"	#
 # ENABLE UWSGI SERVICE IN ADMIN PANEL
 #=================================================
 
-ynh_system_reload uwsgi restart
+ynh_system_reload --service_name=uwsgi --action=restart
 # Ajoute le service au monitoring de Yunohost.
 yunohost service add uwsgi --log "/var/log/uwsgi/app/radicale.log"
 
@@ -269,7 +263,7 @@ fi
 # RELOAD NGINX
 #=================================================
 
-ynh_system_reload nginx
+ynh_system_reload --service_name=nginx
 
 #=================================================
 # SEND A README FOR THE ADMIN
@@ -290,4 +284,4 @@ And the file /etc/radicale/rights to edit the way the calendars will be sharing.
 $infcloud_config
 If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/radicale_ynh"
 
-ynh_send_readme_to_admin "$message" "$admin"
+ynh_send_readme_to_admin --app_message="$message" --recipients="$admin"

scripts/remove

@@ -24,7 +24,7 @@ domain=$(ynh_app_setting_get $app domain)
 #=================================================
 
 # Suppression de la configuration uwsgi
-ynh_system_reload uwsgi stop
+ynh_system_reload --service_name=uwsgi --action=stop
 if [ -h "/etc/uwsgi/apps-enabled/radicale.ini" ]; then
 	echo "Delete uwsgi config"
 	ynh_secure_remove "/etc/uwsgi/apps-enabled/radicale.ini"
@@ -77,7 +77,7 @@ ynh_secure_remove "/etc/$app"	# Delete radicale config
 if [ -e /etc/init.d/uwsgi ]
 then
 	# Redémarre le service uwsgi si il n'est pas désinstallé.
-	ynh_system_reload uwsgi start
+	ynh_system_reload --service_name=uwsgi --action=start
 else
 	if yunohost service status | grep -q uwsgi	# Test l'existence du service dans Yunohost
 	then

scripts/restore

@@ -6,12 +6,7 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-if [ ! -e _common.sh ]; then
+source ../settings/scripts/_common.sh
-	# Get the _common.sh file if it's not in the current directory
-	cp ../settings/scripts/_common.sh ./_common.sh
-	chmod a+rx _common.sh
-fi
-source _common.sh
 source /usr/share/yunohost/helpers
 # Load common variables for all scripts.
 source ../settings/scripts/_variables
@@ -46,6 +41,12 @@ test ! -d $final_path \
 test ! -d "/opt/yunohost/$app" \
 	|| ynh_die "There is already a directory: /opt/yunohost/$app "
 
+#=================================================
+# ACTIVATE MAINTENANCE MODE
+#=================================================
+
+ynh_maintenance_mode_ON
+
 #=================================================
 # STANDARD RESTORE STEPS
 #=================================================
@@ -82,7 +83,7 @@ if [ $infcloud -eq 1 ]
 then
 	ynh_restore_file "/etc/php5/fpm/pool.d/$app.conf"
 	ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini"
-	systemctl reload php5-fpm
+	ynh_system_reload --service_name=php5-fpm
 fi
 
 #=================================================
@@ -126,8 +127,14 @@ ynh_restore_file "/etc/logrotate.d/$app"
 # RELOAD NGINX AND UWSGI
 #=================================================
 
-ynh_system_reload uwsgi restart
+ynh_system_reload --service_name=uwsgi --action=restart
-ynh_system_reload nginx
+ynh_system_reload --service_name=nginx
+
+#=================================================
+# DEACTIVE MAINTENANCE MODE
+#=================================================
+
+ynh_maintenance_mode_OFF
 
 #=================================================
 # SEND A README FOR THE ADMIN
@@ -148,4 +155,4 @@ And the file /etc/radicale/rights to edit the way the calendars will be sharing.
 $infcloud_config
 If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/radicale_ynh"
 
-ynh_send_readme_to_admin "$message" "$admin"
+ynh_send_readme_to_admin --app_message="$message" --recipients="$admin"

scripts/upgrade

@@ -27,10 +27,10 @@ version=$(ynh_app_setting_get $app version)
 # CHECK VERSION
 #=================================================
 
-ynh_abort_if_up_to_date
+upgrade_type=$(ynh_check_app_version_changed)
 
 #=================================================
-# FIX OLD THINGS
+# ENSURE DOWNWARD COMPATIBILITY
 #=================================================
 
 ynh_app_setting_delete $app unprotected_regex
@@ -72,12 +72,17 @@ ynh_abort_if_errors
 # CHECK THE PATH
 #=================================================
 
-
 if [ $infcloud -eq 1 ]; then
 	path_url=$(echo $path_url | sed "s@/infcloud@@")	# Retire /infcloud pour traiter le path seul.
 fi
 path_url=$(ynh_normalize_url_path $path_url)	# Vérifie et corrige la syntaxe du path.
 
+#=================================================
+# ACTIVATE MAINTENANCE MODE
+#=================================================
+
+ynh_maintenance_mode_ON
+
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -85,12 +90,6 @@ path_url=$(ynh_normalize_url_path $path_url)	# Vérifie et corrige la syntaxe du
 #=================================================
 
 ynh_add_nginx_config
-if [ "$path_url" = "/" ]
-then
-	ynh_replace_string "__PATH_NO_ROOT__" "" /etc/nginx/conf.d/$domain.d/$app.conf
-else
-	ynh_replace_string "__PATH_NO_ROOT__" "$path_url" /etc/nginx/conf.d/$domain.d/$app.conf
-fi
 if [ $infcloud -eq 1 ]
 then	# Ajoute InfCloud dans la config Nginx
 	ynh_replace_string "#INFCLOUD#" "" /etc/nginx/conf.d/$domain.d/$app.conf
@@ -118,11 +117,14 @@ fi
 # UPGRADE RADICALE IN ITS VIRTUALENV
 #=================================================
 
-# Upgrade pip packages
+if [ "$upgrade_type" == "UPGRADE_APP" ]
-ynh_secure_remove /opt/yunohost/$app
+then
-virtualenv /opt/yunohost/$app
+	# Upgrade pip packages
-version=$(ynh_app_setting_get $app version $version)
+	ynh_secure_remove /opt/yunohost/$app
-bash -c "source /opt/yunohost/radicale/bin/activate && pip install radicale==$version python-ldap"
+	virtualenv /opt/yunohost/$app
+	version=$(ynh_app_setting_get $app version $version)
+	bash -c "source /opt/yunohost/radicale/bin/activate && pip install radicale==$version python-ldap"
+fi
 
 #=================================================
 # COPY FILES INTO $FINAL_PATH
@@ -135,12 +137,15 @@ cp ../conf/radicale.wsgi $final_path
 cp -a ../sources/extra_files_radicale/. "$final_path"
 # Le fichier regex.py est patché pour corrigé le commit destructeur e807c3d35bea9cfcfcacac83b1b17d748ea15a39 du 3/12/2015 qui arrête la lecture du fichier rights à la première occurence validée.
 mv "$final_path/regex.py" /opt/yunohost/$app/lib/python*/site-packages/radicale/rights/regex.py
-if [ "$infcloud" = "1" ]
+if [ "$upgrade_type" == "UPGRADE_APP" ]
-then	#Instal InfCloud
+then
-	final_path_backup=$final_path	# Sauvegarde le contenu de $final_path
+	if [ "$infcloud" = "1" ]
-	final_path=$final_path/infcloud	# Change final_path pour l'installation de infcloud
+	then	#Instal InfCloud
-	ynh_setup_source "$final_path"	# Télécharge la source, décompresse et copie dans $final_path
+		final_path_backup=$final_path	# Sauvegarde le contenu de $final_path
-	final_path=$final_path_backup	# Restaure le contenu de $final_path
+		final_path=$final_path/infcloud	# Change final_path pour l'installation de infcloud
+		ynh_setup_source "$final_path"	# Télécharge la source, décompresse et copie dans $final_path
+		final_path=$final_path_backup	# Restaure le contenu de $final_path
+	fi
 fi
 
 #=================================================
@@ -230,7 +235,7 @@ cp ../conf/radicale.ini /etc/uwsgi/apps-available/
 # RESTART UWSGI
 #=================================================
 
-ynh_system_reload uwsgi restart
+ynh_system_reload --service_name=uwsgi --action=restart
 
 #=================================================
 # PREPARE THE HOOKS
@@ -240,6 +245,12 @@ ynh_system_reload uwsgi restart
 ynh_replace_string "__FINALPATH__" "$final_path" ../hooks/post_user_create
 ynh_replace_string "__FINALPATH__" "$final_path" ../hooks/post_user_delete
 
+#=================================================
+# SETUP LOGROTATE
+#=================================================
+
+ynh_use_logrotate --non-append
+
 #=================================================
 # GENERIC FINALISATION
 #=================================================
@@ -260,4 +271,4 @@ fi
 # RELOAD NGINX
 #=================================================
 
-ynh_system_reload nginx
+ynh_system_reload --service_name=nginx