cleaning

conf/.env

@@ -81,8 +81,8 @@ DEBUG=cache,presenters,events,emails,mailer,utils,http,server,processors
 # "you've been invited" you'll need to provide authentication for an SMTP server
 SMTP_HOST='localhost'
 SMTP_PORT='25'
-SMTP_USERNAME=''
+SMTP_USERNAME='__APP__'
-SMTP_PASSWORD=''
+SMTP_PASSWORD='__MAIL_PWD__'
 SMTP_FROM_EMAIL='__APP__@__DOMAIN__'
 SMTP_REPLY_EMAIL='webmaster@__DOMAIN__'
 SMTP_TLS_CIPHERS=

manifest.toml

@@ -59,6 +59,7 @@ ram.runtime = "50M"
         sha256 = "7f7afaff1c12a197583871659f7d08355586a4727133e903a63fd5def1bfbcd2"
 
     [resources.system_user]
+    allow_email = true
 
     [resources.install_dir]
 

scripts/restore

@@ -10,17 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-#REMOVEME? ynh_clean_setup () {
-	#### Remove this function if there's nothing to clean before calling the remove script.
-	true
-}
-# Exit if an error occurs during the execution of the script
-#REMOVEME? ynh_abort_if_errors
-
 #=================================================
 # LOAD SETTINGS
 #=================================================
@@ -28,13 +17,6 @@ source /usr/share/yunohost/helpers
 
 #REMOVEME? app=$YNH_APP_INSTANCE_NAME
 
-#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir)
-#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain)
-#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path)
-#REMOVEME? port=$(ynh_app_setting_get --app=$app --key=port)
-#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-#REMOVEME? language_key=$(ynh_app_setting_get --app=$app --key=language_key)
-#REMOVEME? secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)
 #REMOVEME? utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret)
 #REMOVEME? dex_app=$(ynh_app_setting_get --app=$app --key=dex_app)
 #REMOVEME? dex_domain=$(ynh_app_setting_get --app=$app --key=dex_domain)
@@ -46,14 +28,6 @@ source /usr/share/yunohost/helpers
 #REMOVEME? dex_token_uri=$(ynh_app_setting_get --app=$app --key=dex_token_uri)
 #REMOVEME? dex_user_uri=$(ynh_app_setting_get --app=$app --key=dex_user_uri)
 
-#=================================================
-# CHECK IF THE APP CAN BE RESTORED
-#=================================================
-#REMOVEME? ynh_script_progression --message="Validating restoration parameters..." --weight=1
-
-#REMOVEME? test ! -d $install_dir \
-	|| ynh_die --message="There is already a directory: $install_dir"
-
 #=================================================
 # CHECK IF DEX IS INSTALLED, IF NOT INSTALL IT
 #=================================================
@@ -68,23 +42,6 @@ if ! yunohost app list | grep -q "id: $dex_app"; then
 	yunohost app install https://github.com/YunoHost-Apps/dex_ynh --force --args "domain=$dex_domain&path=$dex_path&OIDC_name=$oidc_name&OIDC_secret=$oidc_secret&OIDC_callback=$oidc_callback"
 fi
 
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
-#=================================================
-# RECREATE THE DEDICATED USER
-#=================================================
-#REMOVEME? ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
-
-# Create the dedicated user (if not existing)
-#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir"
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
@@ -92,14 +49,12 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
 #=================================================
 # RESTORE LOCAL STORAGE
 #=================================================
-
 ynh_script_progression --message="Restoring the app local storage..." --weight=1
 
 ynh_restore_file --origin_path="/var/lib/outline"
@@ -107,29 +62,35 @@ ynh_restore_file --origin_path="/var/lib/outline"
 chmod -R o-rwx "/var/lib/outline"
 chown -R $app:www-data "/var/lib/outline"
 
+#=================================================
+# RESTORE THE POSTGRESQL DATABASE
+#=================================================
+ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=6
+
+ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
+
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
-#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..." --weight=1
+ynh_script_progression --message="Reinstalling dependencies..." --weight=1
 
 # Install nodejs
 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION 2>&1
 
-#REMOVEME? ynh_install_app_dependencies $pkg_dependencies 2>&1
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-# Install Yarn
+ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
-#REMOVEME? ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
+systemctl enable $app.service --quiet
 
-#=================================================
+ynh_restore_file --origin_path="/etc/logrotate.d/$app"
-# RESTORE THE POSTGRESQL DATABASE
-#=================================================
-#REMOVEME? ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=6
 
-#REMOVEME? ynh_psql_test_if_first_run
+ynh_restore_file --origin_path="/var/log/$app/$app.log"
-#REMOVEME? ynh_psql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$secret_key
+
-ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
+ynh_restore_file --origin_path="/etc/cron.d/$app"
+
+yunohost service add $app --description="Outline server" --log="/var/log/$app/$app.log"
 
 #=================================================
 # UPDATING A CONFIGURATION
@@ -143,58 +104,15 @@ ynh_add_config --template="../conf/.env" --destination="$install_dir/.env"
 chmod 400 "$install_dir/.env"
 chown $app:$app "$install_dir/.env"
 
-#=================================================
-# RESTORE SYSTEMD
-#=================================================
-ynh_script_progression --message="Restoring the systemd configuration..." --weight=1
-
-ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
-systemctl enable $app.service --quiet
-
-#=================================================
-# RESTORE THE LOGROTATE CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1
-
-ynh_restore_file --origin_path="/etc/logrotate.d/$app"
-
-#=================================================
-# RESTORE THE LOGS
-#=================================================
-ynh_script_progression --message="Restoring the logs..." --weight=1
-
-ynh_restore_file --origin_path="/var/log/$app/$app.log"
-
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
-yunohost service add $app --description="Outline server" --log="/var/log/$app/$app.log"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# RELOAD NGINX AND PHP-FPM
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
-#=================================================
-# RESTORE THE CRON FILE
-#=================================================
-ynh_script_progression --message="Restoring cron job..." --weight=1
-
-ynh_restore_file --origin_path="/etc/cron.d/$app"
-
 #=================================================
 # END OF SCRIPT
 #=================================================