From 798ebb2aa57fcae48476184f946d2dd0f584d285 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 13 Jan 2024 09:34:45 +0100 Subject: [PATCH] fix --- scripts/install | 28 ++++++++-------------------- scripts/remove | 22 ---------------------- scripts/restore | 8 -------- scripts/upgrade | 14 +------------- 4 files changed, 9 insertions(+), 63 deletions(-) diff --git a/scripts/install b/scripts/install index 5efff35..70ed8d8 100644 --- a/scripts/install +++ b/scripts/install @@ -50,13 +50,18 @@ chmod -R o-rwx "$install_dir" chown -R $app:$app "$install_dir" #================================================= -# NGINX CONFIGURATION +# SETUP SYSTEMD #================================================= -ynh_script_progression --message="Configuring NGINX web server..." +ynh_script_progression --message="Configuring a systemd service..." # Create a dedicated NGINX config ynh_add_nginx_config +# Create a dedicated systemd config +ynh_add_systemd_config + +yunohost service add $app --description="$app daemon for Wiki.js" --log="/var/log/$app/$app.log" + #================================================= # SPECIFIC SETUP #================================================= @@ -71,28 +76,11 @@ yunohost user create $ldap_user --firstname "SvcWikijsLdap" --lastname "SvcWikij #================================================= ynh_script_progression --message="Adding a configuration file..." -ynh_add_config --template="../conf/config.sample.yml" --destination="$install_dir/config.yml" +ynh_add_config --template="config.sample.yml" --destination="$install_dir/config.yml" chmod 400 "$install_dir/config.yml" chown $app:$app "$install_dir/config.yml" -#================================================= -# SETUP SYSTEMD -#================================================= -ynh_script_progression --message="Configuring a systemd service..." - -# Create a dedicated systemd config -ynh_add_systemd_config - -#================================================= -# GENERIC FINALIZATION -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." - -yunohost service add $app --description="$app daemon for Wiki.js" --log="/var/log/$app/$app.log" - #================================================= # START SYSTEMD SERVICE #================================================= diff --git a/scripts/remove b/scripts/remove index 884d24d..91fc551 100644 --- a/scripts/remove +++ b/scripts/remove @@ -22,37 +22,15 @@ then yunohost service remove $app fi -#================================================= -# STOP AND REMOVE SERVICE -#================================================= -ynh_script_progression --message="Stopping and removing the systemd service..." - # Remove the dedicated systemd config ynh_remove_systemd_config -#================================================= -# REMOVE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." - # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." - # Remove metapackage and its dependencies ynh_remove_nodejs -#================================================= -# SPECIFIC REMOVE -#================================================= -# REMOVE LDAP USER -#================================================= -ynh_script_progression --message="Removing LDAP user..." - yunohost user delete $ldap_user --purge #================================================= diff --git a/scripts/restore b/scripts/restore index 0dd5d0b..8d7b924 100644 --- a/scripts/restore +++ b/scripts/restore @@ -17,7 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." ynh_restore_file --origin_path="$install_dir" - chmod -R o-rwx "$install_dir" chown -R $app:$app "$install_dir" @@ -76,13 +75,6 @@ ynh_script_progression --message="Starting a systemd service..." ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="HTTP Server:" -#================================================= -# GENERIC FINALIZATION -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." - ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 7330eed..d5d8d55 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,17 +38,6 @@ if [[ -z "$ldap_user" ]]; then yunohost user create $ldap_user --firstname "SvcWikijsLdap" --lastname "SvcWikijsLdap" --domain $domain --password $ldap_password -q 0 fi - -ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies - -#================================================= -# CREATE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Making sure dedicated system user exists..." - -# Create a dedicated user (if not existing) -#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -81,7 +70,6 @@ then fi fi -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:$app "$install_dir" @@ -108,7 +96,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Updating a configuration file..." -ynh_add_config --template="../conf/config.sample.yml" --destination="$install_dir/config.yml" +ynh_add_config --template="config.sample.yml" --destination="$install_dir/config.yml" chmod 400 "$install_dir/config.yml" chown $app:$app "$install_dir/config.yml"