changed psql.sh according to helpers,added backup and restore

check_process

@@ -17,7 +17,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=0
-		backup_restore=0
+		backup_restore=1
 		multi_instance=1
 		incorrect_path=0
 		port_already_use=1

scripts/backup

@@ -0,0 +1,78 @@
+#!/bin/bash
+
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+if [ ! -e _common.sh ]; then
+	# 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 psql.sh
+source ../settings/scripts/psql.sh
+source ../settings/scripts/nodejs.sh
+source nodejs.sh
+source /usr/share/yunohost/helpers
+
+#=================================================
+# MANAGE SCRIPT FAILURE
+#=================================================
+
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
+#=================================================
+# LOAD SETTINGS
+#=================================================
+
+app=$YNH_APP_INSTANCE_NAME
+
+final_path=$(ynh_app_setting_get $app final_path)
+domain=$(ynh_app_setting_get $app domain)
+db_name=$(ynh_app_setting_get $app psql_db)
+
+
+#=================================================
+# STANDARD BACKUP STEPS
+#=================================================
+# BACKUP THE APP MAIN DIR
+#=================================================
+
+ynh_backup "$final_path"
+
+# Copy the data directory
+
+ynh_backup /home/yunohost.app/${app}
+
+
+#=================================================
+# BACKUP THE NGINX CONFIGURATION
+#=================================================
+
+ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
+
+#=================================================
+# BACKUP THE PostgreSQL DATABASE
+#=================================================
+
+ynh_psql_dump_db "$db_name" > db.sql
+ynh_backup "db.sql"
+
+#=================================================
+# SPECIFIC BACKUP
+#=================================================
+# BACKUP LOGROTATE
+#=================================================
+
+ynh_backup "/etc/logrotate.d/$app"
+
+
+#=================================================
+# BACKUP SYSTEMD
+#=================================================
+
+ynh_backup "/etc/systemd/system/$app.service"

scripts/install

@@ -7,6 +7,8 @@
 #=================================================
 
 source _common.sh
+source ../settings/scripts/psql.sh
+source ../settings/scripts/nodejs.sh
 source psql.sh
 source nodejs.sh
 source /usr/share/yunohost/helpers

scripts/psql.sh

@@ -1,9 +1,41 @@
 #!/bin/bash
 
 #=================================================
+#
 # POSTGRES HELPERS
+#
+# Point of contact : Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
 #=================================================
 
+ynh_psql_test_if_first_run() {
+	if [ -f /etc/yunohost/psql ];
+	then
+		echo "PostgreSQL is already installed, no need to create master password"
+	else
+		pgsql=$(ynh_string_random)
+		pg_hba=""
+		echo "$pgsql" >> /etc/yunohost/psql
+
+		if [ -e /etc/postgresql/9.4/ ]
+		then
+			pg_hba=/etc/postgresql/9.4/main/pg_hba.conf
+		elif [ -e /etc/postgresql/9.6/ ]
+		then
+			pg_hba=/etc/postgresql/9.6/main/pg_hba.conf
+		else
+			ynh_die "postgresql shoud be 9.4 or 9.6"
+		fi
+
+		systemctl start postgresql
+                su --command="psql -c\"ALTER user postgres WITH PASSWORD '${pgsql}'\"" postgres
+		# we can't use peer since YunoHost create users with nologin
+		sed -i '/local\s*all\s*all\s*peer/i \
+		local all all password' "$pg_hba"
+		systemctl enable postgresql
+		systemctl reload postgresql
+	fi
+}
+
 # Open a connection as a user
 #
 # example: ynh_psql_connect_as 'user' 'pass' <<< "UPDATE ...;"
@@ -14,7 +46,10 @@
 # | arg: pwd - the user password
 # | arg: db - the database to connect to
 ynh_psql_connect_as() {
-    ynh_die "ynh_psql_connect_as is not yet implemented"
+	user="$1"
+	pwd="$2"
+	db="$3"
+	su --command="PGUSER=\"${user}\" PGPASSWORD=\"${pwd}\" psql \"${db}\"" postgres
 }
 
 # # Execute a command as root user
@@ -23,8 +58,8 @@ ynh_psql_connect_as() {
 # | arg: sql - the SQL command to execute
 # | arg: db - the database to connect to
 ynh_psql_execute_as_root () {
-        sudo su -c "psql" - postgres <<< ${1}
+	sql="$1"
-#TODO support db argument ?
+	su --command="psql" postgres <<< "$sql"
 }
 
 # Execute a command from a file as root user
@@ -33,7 +68,29 @@ ynh_psql_execute_as_root () {
 # | arg: file - the file containing SQL commands
 # | arg: db - the database to connect to
 ynh_psql_execute_file_as_root() {
-     ynh_die "ynh_psql_execute_file_as_root is not yet implemented"
+	file="$1"
+	db="$2"
+	su -c "psql $db" postgres < "$file"
+}
+
+# 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 "psqlpwd" into the app settings.
+#
+# usage: ynh_psql_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_psql_setup_db () {
+	db_user="$1"
+	app="$1"
+	db_name="$2"
+	new_db_pwd=$(ynh_string_random)	# Generate a random password
+	# If $3 is not given, use new_db_pwd instead for db_pwd.
+	db_pwd="${3:-$new_db_pwd}"
+	ynh_psql_create_db "$db_name" "$db_user" "$db_pwd"	# Create the database
+	ynh_app_setting_set "$app" psqlpwd "$db_pwd"	# Store the password in the app's config
 }
 
 # Create a database and grant optionnaly privilegies to a user
@@ -41,25 +98,25 @@ ynh_psql_execute_file_as_root() {
 # usage: ynh_psql_create_db db [user [pwd]]
 # | arg: db - the database name to create
 # | arg: user - the user to grant privilegies
-# | arg: pwd - the password to identify user by
+# | arg: pwd  - the user password
 ynh_psql_create_db() {
-    db=$1
+	db="$1"
-    # grant all privilegies to user
+	user="$2"
-    if [[ $# -gt 1 ]]; then
+	pwd="$3"
-        ynh_psql_create_user ${2} "${3}"
+	ynh_psql_create_user "$user" "$pwd"
-        sudo su -c "createdb -O ${2} $db" -  postgres
+	su --command="createdb --owner=\"${user}\" \"${db}\"" postgres
-    else
-        sudo su -c "createdb $db" -  postgres
-    fi
-
 }
 
 # Drop a database
 #
 # usage: ynh_psql_drop_db db
 # | arg: db - the database name to drop
-ynh_psql_drop_db() {
+# | arg: user - the user to drop
-    sudo su -c "dropdb ${1}" -  postgres
+ynh_psql_remove_db() {
+	db="$1"
+	user="$2"
+	su --command="dropdb \"${db}\"" postgres
+	ynh_psql_drop_user "${user}"
 }
 
 # Dump a database
@@ -70,7 +127,8 @@ ynh_psql_drop_db() {
 # | arg: db - the database name to dump
 # | ret: the psqldump output
 ynh_psql_dump_db() {
-    ynh_die "ynh_psql_dump_db is not yet implemented"
+	db="$1"
+	su --command="pg_dump \"${db}\"" postgres
 }
 
 
@@ -78,10 +136,10 @@ ynh_psql_dump_db() {
 #
 # usage: ynh_psql_create_user user pwd [host]
 # | arg: user - the user name to create
-# | arg: pwd - the password to identify user by
 ynh_psql_create_user() {
-        ynh_psql_execute_as_root \
+	user="$1"
-        "CREATE USER ${1} WITH PASSWORD '${2}';"
+	pwd="$2"
+        su --command="psql -c\"CREATE USER ${user} WITH PASSWORD '${pwd}'\"" postgres
 }
 
 # Drop a user
@@ -89,22 +147,6 @@ ynh_psql_create_user() {
 # usage: ynh_psql_drop_user user
 # | arg: user - the user name to drop
 ynh_psql_drop_user() {
-    sudo su -c "dropuser ${1}" - postgres
+	user="$1"
-}
+	su --command="dropuser \"${user}\"" postgres
-
-ynh_psql_test_if_first_run() {
-	if [ -f /etc/yunohost/psql ];
-	then
-		echo "PostgreSQL is already installed, no need to create master password"
-	else
-		local pgsql=$(ynh_string_random)
-		echo "$pgsql" >> /etc/yunohost/psql
-		systemctl start postgresql
-		sudo -u postgres psql -c"ALTER user postgres WITH PASSWORD '${pgsql}'"
-		# we can't use peer since YunoHost create users with nologin
-		sed -i '/local\s*all\s*all\s*peer/i \
-			local all all password' /etc/postgresql/9.4/main/pg_hba.conf
-		systemctl enable postgresql
-		systemctl reload postgresql
-	fi
 }

scripts/remove

@@ -1,3 +1,4 @@
+
 #!/bin/bash
 
 #=================================================
@@ -7,6 +8,8 @@
 #=================================================
 
 source _common.sh
+source ../settings/scripts/psql.sh
+source ../settings/scripts/nodejs.sh
 source psql.sh
 source nodejs.sh
 source /usr/share/yunohost/helpers
@@ -54,8 +57,7 @@ ynh_remove_nodejs
 #=================================================
 
 # Remove a database if it exists, along with the associated user
-ynh_psql_drop_db $db_name
+ynh_psql_remove_db $db_name $app
-ynh_psql_drop_user $app
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================

scripts/restore

@@ -0,0 +1,132 @@
+#!/bin/bash
+
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+if [ ! -e _common.sh ]; then
+	# 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 psql.sh
+source ../settings/scripts/psql.sh
+source ../settings/scripts/nodejs.sh
+source nodejs.sh
+source /usr/share/yunohost/helpers
+
+#=================================================
+# MANAGE SCRIPT FAILURE
+#=================================================
+
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
+#=================================================
+# LOAD SETTINGS
+#=================================================
+
+app=$YNH_APP_INSTANCE_NAME
+
+domain=$(ynh_app_setting_get $app domain)
+path_url="/"
+final_path=$(ynh_app_setting_get $app final_path)
+port=$(ynh_app_setting_get $app port)
+db_name=$(ynh_app_setting_get $app psql_db)
+db_pwd=$(ynh_app_setting_get $app psqlpwd)
+
+
+#=================================================
+# CHECK IF THE APP CAN BE RESTORED
+#=================================================
+
+ynh_webpath_available $domain $path_url \
+	|| ynh_die "Path not available: ${domain}${path_url}"
+test ! -d $final_path \
+	|| ynh_die "There is already a directory: $final_path "
+	
+ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf"
+
+#=================================================
+# FIND AND OPEN A PORT
+#=================================================
+
+# Find a free port
+ynh_find_port $port
+# Open this port
+yunohost firewall allow Both $port 2>&1
+ynh_app_setting_set $app port $port
+
+
+#=================================================
+# RESTORE THE APP MAIN DIR
+#=================================================
+
+ynh_restore_file "$final_path"
+ynh_restore_file "/home/yunohost.app/${app}"
+
+#=================================================
+# RECREATE THE DEDICATED USER
+#=================================================
+
+# Create the dedicated user (if not existing)
+ynh_system_user_create $app
+
+
+# Set right permissions for curl install
+datadir="/home/yunohost.app/${app}/storage"
+chown -R $app:$app "$final_path" "$datadir"
+
+#=================================================
+# RESTORE THE PostgreSQL DATABASE
+#=================================================
+
+ynh_psql_test_if_first_run
+ynh_psql_setup_db "$app" "$db_name" "$db_pwd"
+ynh_psql_execute_file_as_root ./db.sql "$db_name"
+
+
+
+#=================================================
+# SPECIFIC RESTORATION
+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+
+# install yarn
+wget https://github.com/yarnpkg/yarn/releases/download/v1.5.1/yarn_1.5.1_all.deb
+echo "a4770cd8dcb13dc9a9218940dbd24b510ddf5eec78adb4e0da9ef3760b55a76e yarn_1.5.1_all.deb" | sha256sum -c || ynh_die
+sudo dpkg -i yarn_1.5.1_all.deb
+
+# add backports (required to install ffmpeg)
+echo "deb http://httpredir.debian.org/debian jessie-backports main" | sudo tee /etc/apt/sources.list.d/jessie-backports.list
+ynh_package_update
+
+# Define and install dependencies
+ynh_install_app_dependencies postgresql-9.4 ffmpeg redis-server redis-tools
+
+# install nodejs
+ynh_install_nodejs 8
+
+#=================================================
+# RESTORE SYSTEMD
+#=================================================
+
+ynh_restore_file "/etc/systemd/system/$app.service"
+systemctl enable $app.service
+
+#=================================================
+# RESTORE THE LOGROTATE CONFIGURATION
+#=================================================
+
+ynh_restore_file "/etc/logrotate.d/$app"
+
+#=================================================
+# GENERIC FINALIZATION
+#=================================================
+(cd $final_path && yarn install --production --pure-lockfile)
+systemctl reload nginx
+service  $app restart

scripts/upgrade

@@ -7,6 +7,8 @@
 #=================================================
 
 source _common.sh
+source psql.sh
+source nodejs.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -22,7 +24,7 @@ admin_email=$(ynh_app_setting_get $app admin_email)
 admin_pass=$(ynh_app_setting_get $app admin_pass)
 final_path=$(ynh_app_setting_get $app final_path)
 port=$(ynh_app_setting_get $app port)
-db_name=$(ynh_app_setting_get $app db_name)
+db_name=$(ynh_app_setting_get $app psql_db)
 db_pwd=$(ynh_app_setting_get $app psqlpwd)
 
 #=================================================