From 944ac787bdea3f9b7c9f474c54f1b7ffa66fa909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 20 Jun 2024 23:00:09 +0200 Subject: [PATCH] cleaning --- .gitignore | 3 +- scripts/_common.sh | 14 +------- scripts/backup | 23 ++++--------- scripts/change_url | 44 ++++++++++-------------- scripts/install | 71 +++++++++++++++++--------------------- scripts/remove | 28 ++++++--------- scripts/restore | 34 +++++++------------ scripts/upgrade | 85 ++++++++++++++++++++-------------------------- 8 files changed, 119 insertions(+), 183 deletions(-) diff --git a/.gitignore b/.gitignore index 90c63c5..7e375b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .DS_Store -._.DS_Store \ No newline at end of file +._.DS_Store*~ +~.sw[op] diff --git a/scripts/_common.sh b/scripts/_common.sh index f122fe2..838b59a 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,19 +1,7 @@ #!/bin/bash #================================================= -# COMMON VARIABLES +# COMMON VARIABLES AND CUSTOM HELPERS #================================================= go_version=1.20 - -#================================================= -# PERSONAL HELPERS -#================================================= - -#================================================= -# EXPERIMENTAL HELPERS -#================================================= - -#================================================= -# FUTURE OFFICIAL HELPERS -#================================================= diff --git a/scripts/backup b/scripts/backup index c2cadee..e6176d5 100755 --- a/scripts/backup +++ b/scripts/backup @@ -1,43 +1,34 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - # 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 -#================================================= -# DECLARE DATA AND CONF FILES TO BACKUP -#================================================= -ynh_print_info --message="Declaring files to be backed up..." +ynh_print_info "Declaring files to be backed up..." #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$install_dir" +ynh_backup "$install_dir" #================================================= # BACKUP THE DATA DIR #================================================= -ynh_backup --src_path="$data_dir" --is_big +ynh_backup "$data_dir" #================================================= # SYSTEM CONFIGURATION #================================================= -ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" -ynh_backup --src_path="/etc/systemd/system/$app.service" -ynh_backup --src_path="/etc/systemd/system/${app}_ldap.service" +ynh_backup "/etc/systemd/system/$app.service" +ynh_backup "/etc/systemd/system/${app}_ldap.service" #================================================= # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." +ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index af6eb2d..21611a4 100755 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,80 +1,70 @@ #!/bin/bash -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +ynh_script_progression "Loading installation settings..." -key=$(ynh_app_setting_get --app=$app --key=key) -password_hash=$(ynh_app_setting_get --app=$app --key=password_hash) +key=$(ynh_app_setting_get --key=key) +password_hash=$(ynh_app_setting_get --key=password_hash) -#================================================= -# STANDARD MODIFICATIONS #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --weight=1 +ynh_script_progression "Stopping $app's systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" -ynh_systemd_action --service_name=${app}_ldap --action="stop" --log_path="systemd" +ynh_systemctl --service=$app --action="stop" --log_path="systemd" +ynh_systemctl --service=${app}_ldap --action="stop" --log_path="systemd" #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2 +ynh_script_progression "Updating NGINX web server configuration..." -ynh_change_url_nginx_config +ynh_config_change_url_nginx #================================================= # SPECIFIC MODIFICATIONS #================================================= # UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Updating a configuration file..." --weight=2 +ynh_script_progression "Updating configuration..." domain="$new_domain" # Configure Galène -ynh_add_config --template="config.json" --destination="$install_dir/live/data/config.json" +ynh_config_add --template="config.json" --destination="$install_dir/live/data/config.json" chmod 400 "$install_dir/live/data/config.json" chown $app:$app "$install_dir/live/data/config.json" # Configure Galene LDAP -#ynh_add_config --template="galene-ldap.json" --destination="$install_dir/live_ldap/data/galene-ldap.json" +#ynh_config_add --template="galene-ldap.json" --destination="$install_dir/live_ldap/data/galene-ldap.json" #chmod 400 "$install_dir/live_ldap/data/galene-ldap.json" #chown $app:$app "$install_dir/live_ldap/data/galene-ldap.json" # Create a group name config -#ynh_add_config --template="groupname.json" --destination="$data_dir/groups/$group_name.json" +#ynh_config_add --template="groupname.json" --destination="$data_dir/groups/$group_name.json" #chmod 400 "$data_dir/groups/$group_name.json" #chown $app:$app "$data_dir/groups/$group_name.json" # Create a group name authenticated on LDAP -ynh_add_config --template="groupname-ldap.json" --destination="$data_dir/groups/YunoHost_Users.json" +ynh_config_add --template="groupname-ldap.json" --destination="$data_dir/groups/YunoHost_Users.json" chmod 400 "$data_dir/groups/YunoHost_Users.json" chown $app:$app "$data_dir/groups/YunoHost_Users.json" -#================================================= -# GENERIC FINALISATION #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=3 +ynh_script_progression "Starting $app's systemd service..." # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" -ynh_systemd_action --service_name=${app}_ldap --action="start" --log_path="systemd" +ynh_systemctl --service=$app --action="start" --log_path="systemd" +ynh_systemctl --service=${app}_ldap --action="start" --log_path="systemd" #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --last +ynh_script_progression "Change of URL completed for $app" diff --git a/scripts/install b/scripts/install index 0a2fcf1..f392d0e 100755 --- a/scripts/install +++ b/scripts/install @@ -1,11 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers @@ -14,22 +8,20 @@ source /usr/share/yunohost/helpers #================================================= password=$YNH_APP_ARG_PASSWORD -ynh_app_setting_set --app=$app --key=password --value="$password" +ynh_app_setting_set --key=password --value="$password" -#================================================= -# STANDARD MODIFICATIONS #================================================= # FIND AND OPEN A PORT #================================================= -ynh_script_progression --message="Configuring firewall..." --weight=1 +ynh_script_progression "Configuring firewall..." # Reserve UDP Port range 49152:65535 -ynh_exec_warn_less yunohost firewall allow UDP -4 49152:65535 +ynh_hide_warnings yunohost firewall allow UDP -4 49152:65535 #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --weight=1 +ynh_script_progression "Setting up source files..." # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir/build" @@ -39,7 +31,7 @@ mkdir -p "$install_dir/live/data" mkdir -p "$install_dir/live_ldap/data" cp -r "$install_dir/build/static/" "$install_dir/live/" -ynh_replace_string --match_string="
Galène
" --replace_string="
Galène
" --target_file="$install_dir/live/static/galene.html" +ynh_replace --match="
Galène
" --replace="
Galène
" --file="$install_dir/live/static/galene.html" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -49,75 +41,74 @@ chown -R $app:www-data "$install_dir" #================================================= # BUILD APP #================================================= -ynh_script_progression --message="Building app..." --weight=1 +ynh_script_progression "Building app..." -ynh_exec_warn_less ynh_install_go --go_version=$go_version -ynh_use_go +go_install pushd $install_dir/build/galene-password-generator/ - ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -o $install_dir/ + ynh_hide_warnings ynh_exec_as_app CGO_ENABLED=0 go build -o $install_dir/ popd pushd $install_dir/build/ - ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -ldflags='-s -w' -o $install_dir/live/ + ynh_hide_warnings ynh_exec_as_app CGO_ENABLED=0 go build -ldflags='-s -w' -o $install_dir/live/ popd pushd $install_dir/build_ldap/ - ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -ldflags='-s -w' -o $install_dir/live_ldap/ + ynh_hide_warnings ynh_exec_as_app CGO_ENABLED=0 go build -ldflags='-s -w' -o $install_dir/live_ldap/ popd -ynh_remove_go -ynh_secure_remove --file="$install_dir/build/" -ynh_secure_remove --file="$install_dir/build_ldap/" -ynh_secure_remove --file="$install_dir/.cache/" -ynh_secure_remove --file="$install_dir/go/" -ynh_secure_remove --file="$install_dir/.go-version" +go_remove +ynh_safe_rm "$install_dir/build/" +ynh_safe_rm "$install_dir/build_ldap/" +ynh_safe_rm "$install_dir/.cache/" +ynh_safe_rm "$install_dir/go/" +ynh_safe_rm "$install_dir/.go-version" chmod +x "$install_dir/galene-password-generator" #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 +ynh_script_progression "Adding $app's configuration..." password_hash=$(echo $($install_dir/galene-password-generator $password)) -ynh_app_setting_set --app=$app --key=password_hash --value="$password_hash" +ynh_app_setting_set --key=password_hash --value="$password_hash" # Configure Galène -ynh_add_config --template="config.json" --destination="$install_dir/live/data/config.json" +ynh_config_add --template="config.json" --destination="$install_dir/live/data/config.json" chmod 400 "$install_dir/live/data/config.json" chown $app:$app "$install_dir/live/data/config.json" # Configure Galène LDAP key=$(jose jwk gen -i '{"kty":"oct","alg":"HS256"}') -ynh_app_setting_set --app=$app --key=key --value="$key" -ynh_add_config --template="galene-ldap.json" --destination="$install_dir/live_ldap/data/galene-ldap.json" +ynh_app_setting_set --key=key --value="$key" +ynh_config_add --template="galene-ldap.json" --destination="$install_dir/live_ldap/data/galene-ldap.json" chmod 400 "$install_dir/live_ldap/data/galene-ldap.json" chown $app:$app "$install_dir/live_ldap/data/galene-ldap.json" # Create a group name config -ynh_add_config --template="groupname.json" --destination="$data_dir/groups/$group_name.json" +ynh_config_add --template="groupname.json" --destination="$data_dir/groups/$group_name.json" chmod 400 "$data_dir/groups/$group_name.json" chown $app:$app "$data_dir/groups/$group_name.json" # Create a group name authenticated on LDAP -ynh_add_config --template="groupname-ldap.json" --destination="$data_dir/groups/YunoHost_Users.json" +ynh_config_add --template="groupname-ldap.json" --destination="$data_dir/groups/YunoHost_Users.json" chmod 400 "$data_dir/groups/YunoHost_Users.json" chown $app:$app "$data_dir/groups/YunoHost_Users.json" #================================================= # SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 +ynh_script_progression "Adding system configurations related to $app..." public_ip4="$(curl -s ip.yunohost.org)" || true # Create a dedicated NGINX config -ynh_add_nginx_config +ynh_config_add_nginx # Create a dedicated systemd config -ynh_add_systemd_config -ynh_add_systemd_config --service=${app}_ldap --template="ldap.service" +ynh_config_add_systemd +ynh_config_add_systemd --service=${app}_ldap --template="ldap.service" yunohost service add $app --description="Videoconferencing server" --needs_exposed_ports="$port_turn" yunohost service add ${app}_ldap --description="LDAP integration for the videoconferencing server" @@ -125,14 +116,14 @@ yunohost service add ${app}_ldap --description="LDAP integration for the videoco #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 +ynh_script_progression "Starting $app's systemd service..." # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" -ynh_systemd_action --service_name=${app}_ldap --action="start" --log_path="systemd" +ynh_systemctl --service=$app --action="start" --log_path="systemd" +ynh_systemctl --service=${app}_ldap --action="start" --log_path="systemd" #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --last +ynh_script_progression "Installation of $app completed" diff --git a/scripts/remove b/scripts/remove index 7d80332..6e8756c 100755 --- a/scripts/remove +++ b/scripts/remove @@ -1,11 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers @@ -14,27 +8,27 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE SERVICE INTEGRATION IN YUNOHOST #================================================= -ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 +ynh_script_progression "Removing system configurations related to $app..." # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) -if ynh_exec_warn_less yunohost service status $app >/dev/null +if ynh_hide_warnings yunohost service status $app >/dev/null then - ynh_script_progression --message="Removing $app service integration..." --weight=1 + ynh_script_progression "Removing $app service integration..." yunohost service remove $app fi # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) -if ynh_exec_warn_less yunohost service status ${app}_ldap >/dev/null +if ynh_hide_warnings yunohost service status ${app}_ldap >/dev/null then - ynh_script_progression --message="Removing ${app}_ldap service integration..." --weight=1 + ynh_script_progression "Removing ${app}_ldap service integration..." yunohost service remove ${app}_ldap fi # Remove the dedicated systemd config -ynh_remove_systemd_config -ynh_remove_systemd_config --service=${app}_ldap +ynh_config_remove_systemd +ynh_config_remove_systemd${app}_ldap # Remove the dedicated NGINX config -ynh_remove_nginx_config +ynh_config_remove_nginx #================================================= # CLOSE A PORT @@ -42,12 +36,12 @@ ynh_remove_nginx_config if yunohost firewall list | grep -q "\- 49152:65535" then - ynh_script_progression --message="Closing UDP ports..." --weight=1 - ynh_exec_warn_less yunohost firewall disallow UDP 49152:65535 + ynh_script_progression "Closing UDP ports..." + ynh_hide_warnings yunohost firewall disallow UDP 49152:65535 fi #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --last +ynh_script_progression "Removal of $app completed" diff --git a/scripts/restore b/scripts/restore index 9dbd5d9..a3403b6 100755 --- a/scripts/restore +++ b/scripts/restore @@ -1,11 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - # 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 @@ -13,9 +7,9 @@ source /usr/share/yunohost/helpers #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring the app main directory..." --weight=1 +ynh_script_progression "Restoring the app main directory..." -ynh_restore_file --origin_path="$install_dir" +ynh_restore "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -23,9 +17,9 @@ chown -R $app:www-data "$install_dir" #================================================= # RESTORE THE DATA DIRECTORY #================================================= -ynh_script_progression --message="Restoring the data directory..." --weight=1 +ynh_script_progression "Restoring the data directory..." -ynh_restore_file --origin_path="$data_dir" --not_mandatory +ynh_restore "$data_dir" chown -R $app:www-data "$data_dir" @@ -34,31 +28,29 @@ chown -R $app:www-data "$data_dir" #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 +ynh_script_progression "Restoring system configurations related to $app..." -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" -ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -ynh_restore_file --origin_path="/etc/systemd/system/${app}_ldap.service" +ynh_restore "/etc/systemd/system/$app.service" +ynh_restore "/etc/systemd/system/${app}_ldap.service" systemctl enable $app.service --quiet yunohost service add $app --description="Videoconferencing server" --needs_exposed_ports="$port_turn" yunohost service add ${app}_ldap --description="LDAP integration for the videoconferencing server" -#================================================= -# GENERIC FINALIZATION #================================================= # RELOAD NGINX AND PHP-FPM OR THE APP SERVICE #================================================= -ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 +ynh_script_progression "Reloading NGINX web server and $app's service..." -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" -ynh_systemd_action --service_name=${app}_ldap --action="start" --log_path="systemd" +ynh_systemctl --service=$app --action="start" --log_path="systemd" +ynh_systemctl --service=${app}_ldap --action="start" --log_path="systemd" -ynh_systemd_action --service_name=nginx --action=reload +ynh_systemctl --service=nginx --action=reload #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --last +ynh_script_progression "Restoration completed for $app" diff --git a/scripts/upgrade b/scripts/upgrade index 5bf9c01..4590a8a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,11 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers @@ -13,22 +7,20 @@ source /usr/share/yunohost/helpers # LOAD SETTINGS #================================================= -password=$(ynh_app_setting_get --app=$app --key=password) +password=$(ynh_app_setting_get --key=password) -#================================================= -# STANDARD UPGRADE STEPS #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --weight=3 +ynh_script_progression "Stopping $app's systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" -ynh_systemd_action --service_name=${app}_ldap --action="stop" --log_path="systemd" +ynh_systemctl --service=$app --action="stop" --log_path="systemd" +ynh_systemctl --service=${app}_ldap --action="stop" --log_path="systemd" #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 +ynh_script_progression "Ensuring downward compatibility..." # For version 0.6~ynh1 and before if [[ ! -d "$install_dir/live" ]] @@ -39,68 +31,65 @@ then mv $tempdir/$app/galene "$install_dir/live/" mv $tempdir/$app/data/ "$install_dir/live/" mv $tempdir/$app/static/ "$install_dir/live/" - ynh_secure_remove --file="$tempdir" + ynh_safe_rm "$tempdir" fi #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Upgrading source files..." --weight=2 +ynh_script_progression "Upgrading source files..." -ynh_setup_source --dest_dir="$install_dir/build" --full_replace=1 -ynh_setup_source --dest_dir="$install_dir/build_ldap" --source_id="ldap" --full_replace=1 +ynh_setup_source --dest_dir="$install_dir/build" --full_replace +ynh_setup_source --dest_dir="$install_dir/build_ldap" --source_id="ldap" --full_replace mkdir -p "$install_dir/live/data" mkdir -p "$install_dir/live_ldap/data" -ynh_secure_remove --file="$install_dir/live/static/" +ynh_safe_rm "$install_dir/live/static/" cp -r "$install_dir/build/static/" "$install_dir/live/" -ynh_replace_string --match_string="
Galène
" --replace_string="
Galène
" --target_file="$install_dir/live/static/galene.html" +ynh_replace --match="
Galène
" --replace="
Galène
" --file="$install_dir/live/static/galene.html" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# SPECIFIC UPGRADE #================================================= # BUILD APP #================================================= -ynh_script_progression --message="Building app..." --weight=1 +ynh_script_progression "Building app..." -ynh_exec_warn_less ynh_install_go --go_version=$go_version -ynh_use_go +go_install pushd $install_dir/build/galene-password-generator/ - ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -o $install_dir/ + ynh_hide_warnings ynh_exec_as_app CGO_ENABLED=0 go build -o $install_dir/ popd pushd $install_dir/build/ - ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -ldflags='-s -w' -o $install_dir/live/ + ynh_hide_warnings ynh_exec_as_app CGO_ENABLED=0 go build -ldflags='-s -w' -o $install_dir/live/ popd pushd $install_dir/build_ldap/ - ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -ldflags='-s -w' -o $install_dir/live_ldap/ + ynh_hide_warnings ynh_exec_as_app CGO_ENABLED=0 go build -ldflags='-s -w' -o $install_dir/live_ldap/ popd -ynh_remove_go -ynh_secure_remove --file="$install_dir/build/" -ynh_secure_remove --file="$install_dir/build_ldap/" -ynh_secure_remove --file="$install_dir/.cache/" -ynh_secure_remove --file="$install_dir/go/" -ynh_secure_remove --file="$install_dir/.go-version" +go_remove +ynh_safe_rm "$install_dir/build/" +ynh_safe_rm "$install_dir/build_ldap/" +ynh_safe_rm "$install_dir/.cache/" +ynh_safe_rm "$install_dir/go/" +ynh_safe_rm "$install_dir/.go-version" chmod +x "$install_dir/galene-password-generator" #================================================= # UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Updating a configuration file..." --weight=2 +ynh_script_progression "Updating configuration..." # If password_hash doesn't exist, create it if [ -z "${password_hash:-}" ]; then password_hash=$(echo $($install_dir/galene-password-generator $password)) - ynh_app_setting_set --app=$app --key=password_hash --value="$password_hash" + ynh_app_setting_set --key=password_hash --value="$password_hash" fi # Configure Galène -ynh_add_config --template="config.json" --destination="$install_dir/live/data/config.json" +ynh_config_add --template="config.json" --destination="$install_dir/live/data/config.json" chmod 400 "$install_dir/live/data/config.json" chown $app:$app "$install_dir/live/data/config.json" @@ -108,35 +97,35 @@ chown $app:$app "$install_dir/live/data/config.json" # If key doesn't exist, create it if [ -z "${key:-}" ]; then key=$(jose jwk gen -i '{"kty":"oct","alg":"HS256"}') - ynh_app_setting_set --app=$app --key=key --value=$key + ynh_app_setting_set --key=key --value=$key fi -ynh_add_config --template="galene-ldap.json" --destination="$install_dir/live_ldap/data/galene-ldap.json" +ynh_config_add --template="galene-ldap.json" --destination="$install_dir/live_ldap/data/galene-ldap.json" chmod 400 "$install_dir/live_ldap/data/galene-ldap.json" chown $app:$app "$install_dir/live_ldap/data/galene-ldap.json" # Create a group name config -ynh_add_config --template="groupname.json" --destination="$data_dir/groups/$group_name.json" +ynh_config_add --template="groupname.json" --destination="$data_dir/groups/$group_name.json" chmod 400 "$data_dir/groups/$group_name.json" chown $app:$app "$data_dir/groups/$group_name.json" # Create a group name authenticated on LDAP -ynh_add_config --template="groupname-ldap.json" --destination="$data_dir/groups/YunoHost_Users.json" +ynh_config_add --template="groupname-ldap.json" --destination="$data_dir/groups/YunoHost_Users.json" chmod 400 "$data_dir/groups/YunoHost_Users.json" chown $app:$app "$data_dir/groups/YunoHost_Users.json" #================================================= # REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 +ynh_script_progression "Upgrading system configurations related to $app..." public_ip4="$(curl -s ip.yunohost.org)" || true # Create a dedicated NGINX config -ynh_add_nginx_config +ynh_config_add_nginx # Create a dedicated systemd config -ynh_add_systemd_config -ynh_add_systemd_config --service=${app}_ldap --template="ldap.service" +ynh_config_add_systemd +ynh_config_add_systemd --service=${app}_ldap --template="ldap.service" yunohost service add $app --description="Videoconferencing server" --needs_exposed_ports="$port_turn" yunohost service add ${app}_ldap --description="LDAP integration for the videoconferencing server" @@ -144,13 +133,13 @@ yunohost service add ${app}_ldap --description="LDAP integration for the videoco #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 +ynh_script_progression "Starting $app's systemd service..." -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" -ynh_systemd_action --service_name=${app}_ldap --action="start" --log_path="systemd" +ynh_systemctl --service=$app --action="start" --log_path="systemd" +ynh_systemctl --service=${app}_ldap --action="start" --log_path="systemd" #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --last +ynh_script_progression "Upgrade of $app completed"