From 125ce10915bdb9ad8d29fcd0a9a0f4a87e826d6c Mon Sep 17 00:00:00 2001
From: ljf <ljf+git@grimaud.me>
Date: Wed, 19 Jun 2019 18:03:19 +0200
Subject: [PATCH] [fix] Backup and upgrade

---
 check_process        |  12 ++++-----
 manifest.json        |   5 +++-
 scripts/.install.swp | Bin 0 -> 20480 bytes
 scripts/_common.sh   |   3 ---
 scripts/backup       |   7 +++--
 scripts/change_url   |   2 +-
 scripts/install      |  60 ++++++++++++++++++++++++-------------------
 scripts/remove       |  25 +++++++-----------
 scripts/restore      |   6 ++++-
 scripts/upgrade      |  55 +++++++++++++++++----------------------
 scripts/ynh_exec_as  |  14 ++++++++++
 11 files changed, 101 insertions(+), 88 deletions(-)
 create mode 100644 scripts/.install.swp
 create mode 100644 scripts/ynh_exec_as

diff --git a/check_process b/check_process
index 1d0b743..ac60eb1 100644
--- a/check_process
+++ b/check_process
@@ -11,12 +11,12 @@
 		setup_sub_dir=1
 		setup_root=1
 		setup_nourl=0
-		setup_private=1
-		setup_public=1
-		upgrade=1
-		backup_restore=1
-		multi_instance=1
-		change_url=1
+		setup_private=0
+		setup_public=0
+		upgrade=0
+		backup_restore=0
+		multi_instance=0
+		change_url=0
 ;;; Levels
 	# If the level 5 (Package linter) is forced to 1. Please add justifications here.
 	Level 5=auto
diff --git a/manifest.json b/manifest.json
index 05352cc..6cfdcd8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,7 +5,7 @@
   "description": {
     "en": "Framaforms helps you create online webforms and surveys"
   },
-  "version": "1.0.0+190618-ynh1",
+  "version": "1.0.0+190618-ynh6",
   "url": "https://framagit.org/framasoft/framaforms",
   "license": "GPL-2.0-only",
   "requirements": {
@@ -55,6 +55,9 @@
         "ask": {
           "en": "Are visitors who do not have a YunoHost account on this server allowed to register and create forms ?"
         },
+        "help": {
+          "en": "If no, only person with an account on your server will be able to create forms. In all cases, visitors will be able to reply to form"
+        },
         "type": "boolean",
         "default": true
       }
diff --git a/scripts/.install.swp b/scripts/.install.swp
new file mode 100644
index 0000000000000000000000000000000000000000..1284576f2bbf616ae1d7df4c296388841e0ee41f
GIT binary patch
literal 20480
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

literal 0
HcmV?d00001

diff --git a/scripts/_common.sh b/scripts/_common.sh
index bbd2e58..22c46d2 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -43,6 +43,3 @@ ynh_save_args () {
     done
 }
 
-source ynh_add_extra_apt_repos__3
-source ynh_install_php__3
-source ynh_composer__2
diff --git a/scripts/backup b/scripts/backup
index 97de111..27e1d43 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -7,7 +7,7 @@
 #=================================================
 
 #Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
-source ../settings/scripts/_common.sh
+#source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -37,6 +37,9 @@ ynh_script_progression --message="Backing up the main app directory..." --time -
 
 ynh_backup --src_path="$final_path"
 
+ynh_script_progression --message="Backing up the answer files..." --time --weight=1
+ynh_backup --src_path="/home/yunohost.app/$app/data" --is_big=1
+
 #=================================================
 # BACKUP THE NGINX CONFIGURATION
 #=================================================
@@ -49,7 +52,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 ynh_script_progression --message="Backing up php-fpm configuration..." --time --weight=1
 
-ynh_backup --src_path="/etc/php/7.0/fpm/pool.d/$app.conf"
+ynh_backup --src_path="/etc/php/7.2/fpm/pool.d/$app.conf"
 
 #=================================================
 # BACKUP THE MYSQL DATABASE
diff --git a/scripts/change_url b/scripts/change_url
index 610952f..87c334a 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -6,7 +6,7 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-source _common.sh
+#source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
diff --git a/scripts/install b/scripts/install
index 8d6ed35..d771588 100644
--- a/scripts/install
+++ b/scripts/install
@@ -8,6 +8,10 @@
 
 source _common.sh
 source /usr/share/yunohost/helpers
+source ynh_add_extra_apt_repos__3
+source ynh_install_php__3
+source ynh_composer__2
+source ynh_exec_as
 
 #=================================================
 # MANAGE SCRIPT FAILURE
@@ -27,7 +31,7 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
-ynh_script_progression --message="Validating installation parameters..." --time --weight=1
+ynh_script_progression --message="Validating installation parameters..." --weight=1
 
 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
@@ -38,7 +42,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
-ynh_script_progression --message="Storing installation settings..." --time --weight=2
+ynh_script_progression --message="Storing installation settings..." --weight=1
 
 ynh_save_args domain path_url password is_public final_path
 
@@ -48,14 +52,14 @@ ynh_save_args domain path_url password is_public final_path
 # INSTALL DEPENDENCIES
 #=================================================
 
-ynh_script_progression --message="Installing dependencies..." --time --weight=7
+ynh_script_progression --message="Installing dependencies..." --weight=7
 
 ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE A PostgreSQL DATABASE
 #=================================================
-ynh_script_progression --message="Creating a PostgreSQL database..." --time --weight=2
+ynh_script_progression --message="Creating a PostgreSQL database..." --weight=2
 
 ynh_psql_test_if_first_run
 
@@ -67,7 +71,7 @@ ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression --message="Setting up source files..." --time --weight=12
+ynh_script_progression --message="Setting up source files..." --weight=9
 
 ### `ynh_setup_source` is used to install an app from a zip or tar.gz file,
 ### downloaded from an upstream source, like a git repository.
@@ -79,7 +83,7 @@ ynh_setup_source --dest_dir="$final_path"
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring nginx web server..." --time --weight=2
+ynh_script_progression --message="Configuring nginx web server..." --weight=1
 
 ### `ynh_add_nginx_config` will use the file conf/nginx.conf
 
@@ -89,7 +93,7 @@ ynh_add_nginx_config
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Configuring system user..." --time --weight=2
+ynh_script_progression --message="Configuring system user..." --weight=3
 
 # Create a system user
 ynh_system_user_create --username=$app
@@ -97,14 +101,14 @@ ynh_system_user_create --username=$app
 #=================================================
 # INSTALL PHP 7.2
 #=================================================
-ynh_script_progression --message="Installing PHP 7.2..." --time --weight=10
+ynh_script_progression --message="Installing PHP 7.2..." --weight=35
 
 ynh_install_php --phpversion="7.2" --package="$extra_pkg_dependencies"
 
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring php-fpm..." --time --weight=2
+ynh_script_progression --message="Configuring php-fpm..." --weight=1
 
 # Create a dedicated php-fpm config
 ynh_add_fpm_config --phpversion="7.2"
@@ -114,7 +118,7 @@ ynh_add_fpm_config --phpversion="7.2"
 #=================================================
 # CREATE DRUSH ALIAS
 #=================================================
-ynh_script_progression --message="Creating Drush alias..." --time --weight=2
+ynh_script_progression --message="Creating Drush alias..." --weight=2
 
 mkdir -p "$final_path/.drush"
 
@@ -128,7 +132,7 @@ ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --
 #=================================================
 # INSTALL COMPOSER
 #=================================================
-ynh_script_progression --message="Installing Composer..." --time --weight=8
+ynh_script_progression --message="Installing Composer..." --weight=31
 
 mkdir -p "$final_path/.composer"
 
@@ -139,7 +143,7 @@ ynh_install_composer --phpversion="7.2" --workdir="$final_path/.composer"
 #=================================================
 # Database initialization
 #=================================================
-ynh_script_progression --message="Initializing PostgreSQL database..." --time --weight=8
+ynh_script_progression --message="Initializing PostgreSQL database..." --weight=8
 
 ynh_replace_string "betaforms" "$db_user" "$final_path/framaforms.sql"
 ynh_psql_execute_file_as_root "$final_path/framaforms.sql" "$db_name"
@@ -147,20 +151,20 @@ ynh_psql_execute_file_as_root "$final_path/framaforms.sql" "$db_name"
 #=================================================
 # Initialize tmp  and private directory
 #=================================================
-ynh_script_progression --message="Initializing tmp and private directory..." --time --weight=8
+ynh_script_progression --message="Initializing tmp and private directory..." --weight=1
 
 mkdir -p "$final_path/sites/default/files"
 chmod 2775 "$final_path/sites/default/files"
 mkdir -p "$final_path/sites/default/files/tmp"
 
-mkdir -p "${final_path}_private"
-chown -R $app: "${final_path}_private"
-chmod 775 "${final_path}_private"
+mkdir -p "/home/yunohost.app/$app/data"
+chown -R $app: "/home/yunohost.app/$app/data"
+chmod 775 "/home/yunohost.app/$app/data"
 
 #=================================================
 # Missing images
 #=================================================
-ynh_script_progression --message="Adding missing images..." --time --weight=2
+ynh_script_progression --message="Adding missing images..." --weight=2
 
 mkdir -p "$final_path/sites/default/files/imgforms"
 
@@ -183,16 +187,18 @@ ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path"
 #=================================================
 # Change admin password and apply custom conf
 #=================================================
-ynh_script_progression --message="Changing admin password..." --time --weight=2
+ynh_script_progression --message="Changing admin password..." --weight=19
 
 chown -R $app: $final_path
+drush="$final_path/.composer/vendor/bin/drush --quiet"
 pushd $final_path
-sudo -u $app $final_path/.composer/vendor/bin/drush upwd --password="$password" "admin"
-sudo -u $app $final_path/.composer/vendor/bin/drush variable-set site_name "Framaforms"
-sudo -u $app $final_path/.composer/vendor/bin/drush variable-set site_mail "no-reply@$domain"
-#sudo -u $app $final_path/.composer/vendor/bin/drush @$app pm-download ldap
-#sudo -u $app $final_path/.composer/vendor/bin/drush @$app pm-enable -y ldap_servers ldap_user ldap_authentication ldap_authorization ldap_authorization_drupal_role
-#sudo -u $app $final_path/.composer/vendor/bin/drush @$app core-cron
+ynh_exec_as $app $drush upwd --password="$password" "admin" --verbose --debug
+ynh_exec_as $app $drush variable-set site_name "Framaforms" --verbose --debug
+ynh_exec_as $app $drush variable-set site_mail "no-reply@$domain" --verbose --debug
+ynh_exec_as $app $drush variable-set file_private_path "/home/yunohost.app/$app/data" --verbose --debug
+#ynh_exec_as $app $drush @$app pm-download ldap
+#ynh_exec_as $app $drush @$app pm-enable -y ldap_servers ldap_user ldap_authentication ldap_authorization ldap_authorization_drupal_role
+#ynh_exec_as $app $drush @$app core-cron
 popd
 
 #=================================================
@@ -220,7 +226,7 @@ chown -R $app: $final_path
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring SSOwat..." --time --weight=1
+ynh_script_progression --message="Configuring SSOwat..." --weight=1
 
 # Make app public if necessary
 if [ $is_public -eq 1 ]
@@ -232,7 +238,7 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..." --time --weight=1
+ynh_script_progression --message="Reloading nginx web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
@@ -240,4 +246,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Installation of $app completed" --time --last
+ynh_script_progression --message="Installation of $app completed" --last
diff --git a/scripts/remove b/scripts/remove
index e812a65..e101721 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -8,6 +8,7 @@
 
 source _common.sh
 source /usr/share/yunohost/helpers
+source ynh_install_php__3
 
 #=================================================
 # LOAD SETTINGS
@@ -26,7 +27,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 # REMOVE THE PostgresSQL DATABASE
 #=================================================
-ynh_script_progression --message="Removing the database..." --time --weight=1
+ynh_script_progression --message="Removing the database..." --weight=1
 
 # Remove a database if it exists, along with the associated user
 ynh_psql_remove_db --db_user=$db_user --db_name=$db_name
@@ -34,7 +35,7 @@ ynh_psql_remove_db --db_user=$db_user --db_name=$db_name
 #=================================================
 # REMOVE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Removing dependencies..." --time --weight=1
+ynh_script_progression --message="Removing dependencies..." --weight=7
 
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
@@ -42,7 +43,7 @@ ynh_remove_app_dependencies
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Removing app main directory..." --time --weight=1
+ynh_script_progression --message="Removing app main directory..." --weight=1
 
 # Remove the app directory securely
 ynh_secure_remove --file="$final_path"
@@ -50,7 +51,7 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing nginx web server configuration..." --time --weight=1
+ynh_script_progression --message="Removing nginx web server configuration..." --weight=1
 
 # Remove the dedicated nginx config
 ynh_remove_nginx_config
@@ -58,25 +59,17 @@ ynh_remove_nginx_config
 #=================================================
 # REMOVE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing php-fpm configuration..." --time --weight=1
+ynh_script_progression --message="Removing php-fpm configuration..." --weight=1
 
 # Remove the dedicated php-fpm config
 ynh_remove_fpm_config
 
 #=================================================
 # SPECIFIC REMOVE
-#=================================================
-# REMOVE THE CRON FILE
-#=================================================
-ynh_script_progression --message="Removing the cron file..." --weight=1
-
-# Remove a cron file
-ynh_secure_remove --file="/etc/cron.d/$app"
-
 #=================================================
 # REMOVE PHP
 #=================================================
-ynh_script_progression --message="Removing php..." --weight=1
+ynh_script_progression --message="Removing php..." --weight=14
 
 ynh_remove_php
 
@@ -85,7 +78,7 @@ ynh_remove_php
 #=================================================
 # REMOVE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Removing the dedicated system user..." --time --weight=1
+ynh_script_progression --message="Removing the dedicated system user..." --weight=1
 
 # Delete a system user
 ynh_system_user_delete --username=$app
@@ -94,4 +87,4 @@ ynh_system_user_delete --username=$app
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Removal of $app completed" --time --last
+ynh_script_progression --message="Removal of $app completed" --last
diff --git a/scripts/restore b/scripts/restore
index ee9dcde..a5f6892 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -9,6 +9,10 @@
 #Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
+source ../settings/scripts/ynh_add_extra_apt_repos__3
+source ../settings/scripts/ynh_install_php__3
+source ../settings/scripts/ynh_composer__2
+source ../settings/scripts/ynh_exec_as
 
 #=================================================
 # MANAGE SCRIPT FAILURE
@@ -102,7 +106,7 @@ ynh_psql_execute_file_as_root ./db.sql "$db_name"
 #=================================================
 ynh_script_progression --message="Reloading nginx web server and php-fpm..." --time --weight=1
 
-ynh_systemd_action --service_name=php7.0-fpm --action=reload
+ynh_systemd_action --service_name=php7.2-fpm --action=reload
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index b142e8f..3fcbfec 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -8,11 +8,15 @@
 
 source _common.sh
 source /usr/share/yunohost/helpers
+source ynh_add_extra_apt_repos__3
+source ynh_install_php__3
+source ynh_composer__2
+source ynh_exec_as
 
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --time --weight=1
+ynh_script_progression --message="Loading installation settings..." --weight=2
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -37,7 +41,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
-ynh_script_progression --message="Ensuring downward compatibility..." --time --weight=1
+ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
 # Fix is_public as a boolean value
 if [ "$is_public" = "Yes" ]; then
@@ -63,7 +67,7 @@ fi
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --time --weight=1
+ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=21
 
 # Backup the current version of the app
 ynh_backup_before_upgrade
@@ -74,18 +78,6 @@ ynh_clean_setup () {
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
-#=================================================
-# CHECK THE PATH
-#=================================================
-
-# Normalize the URL path syntax
-# N.B. : this is for app installations before YunoHost 2.7
-# where this value might be something like /foo/ or foo/
-# instead of /foo ....
-# If nobody installed your app before 2.7, then you may
-# safely remove this line
-path_url=$(ynh_normalize_url_path --path_url=$path_url)
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -94,7 +86,7 @@ path_url=$(ynh_normalize_url_path --path_url=$path_url)
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-	ynh_script_progression --message="Upgrading source files..." --time --weight=1
+	ynh_script_progression --message="Upgrading source files..." --weight=9
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path"
@@ -103,7 +95,7 @@ fi
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading nginx web server configuration..." --time --weight=1
+ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=1
 
 # Create a dedicated nginx config
 ynh_add_nginx_config
@@ -111,14 +103,14 @@ ynh_add_nginx_config
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Upgrading dependencies..." --time --weight=1
+ynh_script_progression --message="Upgrading dependencies..." --weight=5
 
 ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --time --weight=1
+ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
 
 # Create a dedicated user (if not existing)
 ynh_system_user_create --username=$app
@@ -126,14 +118,14 @@ ynh_system_user_create --username=$app
 #=================================================
 # UPGRADE PHP
 #=================================================
-ynh_script_progression --message="Upgrading PHP..." --weight=1
+ynh_script_progression --message="Upgrading PHP..." --weight=12
 
 ynh_install_php --phpversion="7.2" --package="$extra_pkg_dependencies"
 
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading php-fpm configuration..." --time --weight=1
+ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=1
 
 # Create a dedicated php-fpm config
 ynh_add_fpm_config --phpversion="7.2"
@@ -143,25 +135,25 @@ ynh_add_fpm_config --phpversion="7.2"
 #=================================================
 # UPGRADE COMPOSER
 #=================================================
-ynh_script_progression --message="Upgrading Composer..." --weight=1
+ynh_script_progression --message="Upgrading Composer..." --weight=3
 
 ynh_install_composer --phpversion="7.2" --workdir="$final_path/.composer"
 
 #=================================================
 # UPGRADE DRUPAL
 #=================================================
-ynh_script_progression --message="Upgrading Drupal..." --weight=1
+ynh_script_progression --message="Upgrading Drupal..." --time --weight=30
 
 ynh_backup_if_checksum_is_different --file="$final_path/$app/sites/default/settings.php"
 
+drush="$final_path/.composer/vendor/bin/drush --quiet"
 pushd $final_path
-sudo -u $app $final_path/.composer/vendor/bin/drush @$app variable-set --exact maintenance_mode 1 
-sudo -u $app $final_path/.composer/vendor/bin/drush @$app cache-clear all 
-sudo -u $app $final_path/.composer/vendor/bin/drush @$app pm-update -y drupal
-sudo -u $app $final_path/.composer/vendor/bin/drush @$app vset --exact maintenance_mode 0 
-sudo -u $app $final_path/.composer/vendor/bin/drush @$app cache-clear all 
-sudo -u $app $final_path/.composer/vendor/bin/drush @$app l10n-update-refresh
-sudo -u $app $final_path/.composer/vendor/bin/drush @$app l10n-update
+ynh_exec_as $app $drush 
+ynh_exec_as $app $drush variable-set --exact maintenance_mode 1 
+ynh_exec_as $app $drush cache-clear all 
+ynh_exec_as $app $drush pm-update -y drupal
+ynh_exec_as $app $drush vset --exact maintenance_mode 0 
+ynh_exec_as $app $drush cache-clear all 
 popd
 
 #=================================================
@@ -180,7 +172,8 @@ ynh_store_file_checksum --file="$config_file"
 #=================================================
 
 # Set permissions on app files
-chown -R root: $final_path
+chown -R $app: $final_path
+chown -R $app: "${final_path}_private"
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/ynh_exec_as b/scripts/ynh_exec_as
new file mode 100644
index 0000000..2e849dc
--- /dev/null
+++ b/scripts/ynh_exec_as
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Execute a command as another user
+# usage: exec_as USER COMMAND [ARG ...]
+ynh_exec_as() {
+  local USER=$1
+  shift 1
+
+  if [[ $USER = $(whoami) ]]; then
+    eval "$@"
+  else
+    sudo -u "$USER" "$@"
+  fi
+}