diff --git a/check_process b/check_process index da085f9..4254b27 100644 --- a/check_process +++ b/check_process @@ -14,6 +14,7 @@ setup_private=0 setup_public=1 upgrade=1 + upgrade=1 from_commit=0ea33568698b64285207a9e3e9b5bd1f621e7826 backup_restore=1 multi_instance=0 # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. diff --git a/conf/metronome_regen_conf.hook b/conf/metronome_regen_conf.hook index 576bbb7..c97cd4f 100644 --- a/conf/metronome_regen_conf.hook +++ b/conf/metronome_regen_conf.hook @@ -5,24 +5,13 @@ dryrun=${3:-0} # 0/1 --dry-run argument pending_conf=$4 # Path of the pending conf file do_pre_regen() { - metronome_conf_dir="/home/yunohost.conf/pending/metronome/etc/metronome/conf.d" - domain="$(yunohost app setting jitsi domain)" - - # Delete pending metronome config - rm "${metronome_conf_dir}/$domain.cfg.lua" - rm "${metronome_conf_dir}/auth.$domain.cfg.lua" - rm "${metronome_conf_dir}/conference.$domain.cfg.lua" - rm "${metronome_conf_dir}/jitsi-videobridge.$domain.cfg.lua" - rm "${metronome_conf_dir}/focus.$domain.cfg.lua" - # Add specific domain metronome conf + metronome_conf_dir="/home/yunohost.conf/pending/metronome/etc/metronome/conf.d" cp -f "/usr/share/yunohost/templates/jitsi/." "$metronome_conf_dir/" } do_post_regen() { - # Put your code here for post regen conf. - # Be careful, this part will be executed only if the configuration has been modified. - sudo chown -R metronome: /etc/metronome/conf.d/ + regen_conf_files=$1 } case "$1" in diff --git a/scripts/backup b/scripts/backup index 7675656..a643a1b 100644 --- a/scripts/backup +++ b/scripts/backup @@ -57,16 +57,25 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # SPECIFIC BACKUP #================================================= -# BACKUP CONF_REGEN HOOK +# BACKUP METRONOME #================================================= +ynh_print_info --message="Backing up Metronome..." +# Backup Metronome domain conf template ynh_backup --src_path="/usr/share/yunohost/templates/jitsi/$domain.cfg.lua" ynh_backup --src_path="/usr/share/yunohost/templates/jitsi/auth.$domain.cfg.lua" ynh_backup --src_path="/usr/share/yunohost/templates/jitsi/conference.$domain.cfg.lua" ynh_backup --src_path="/usr/share/yunohost/templates/jitsi/jitsi-videobridge.$domain.cfg.lua" ynh_backup --src_path="/usr/share/yunohost/templates/jitsi/focus.$domain.cfg.lua" + +# Backup Metronome Hook ynh_backup --src_path="/usr/share/yunohost/hooks/conf_regen/50-metronome_$app" +# Backup Metronome Module +ynh_backup --src_path="/usr/lib/metronome/modules/mod_carbons.lua" +ynh_backup --src_path="/usr/lib/metronome/modules/mod_http_altconnect.lua" +ynh_backup --src_path="/usr/lib/metronome/modules/mod_smacks.lua" + #================================================= # BACKUP LOGROTATE #================================================= @@ -74,21 +83,6 @@ ynh_print_info --message="Backing up logrotate configuration..." ynh_backup --src_path="/etc/logrotate.d/$app" -#================================================= -# BACKUP METRONOME CONFIG -#================================================= -ynh_print_info --message="Backing up Metronome configuration..." - -ynh_backup --src_path="/etc/metronome/conf.d/$domain.cfg.lua" -ynh_backup --src_path="/etc/metronome/conf.d/auth.$domain.cfg.lua" -ynh_backup --src_path="/etc/metronome/conf.d/conference.$domain.cfg.lua" -ynh_backup --src_path="/etc/metronome/conf.d/jitsi-videobridge.$domain.cfg.lua" -ynh_backup --src_path="/etc/metronome/conf.d/focus.$domain.cfg.lua" - -ynh_backup --src_path="/usr/lib/metronome/modules/mod_carbons.lua" -ynh_backup --src_path="/usr/lib/metronome/modules/mod_http_altconnect.lua" -ynh_backup --src_path="/usr/lib/metronome/modules/mod_smacks.lua" - #================================================= # BACKUP SYSTEMD #================================================= diff --git a/scripts/install b/scripts/install index 80dc320..f4d7fa0 100644 --- a/scripts/install +++ b/scripts/install @@ -159,7 +159,7 @@ touch "/usr/share/yunohost/templates/jitsi/focus.$domain.cfg.lua" cp -R ../conf/metronome_regen_conf.hook /usr/share/yunohost/hooks/conf_regen/50-metronome_$app yunohost tools regen-conf metronome -# Add Metronome Package +# Add Metronome modules cp ../conf/mod_carbons.lua /usr/lib/metronome/modules/mod_carbons.lua cp ../conf/mod_http_altconnect.lua /usr/lib/metronome/modules/mod_http_altconnect.lua cp ../conf/mod_smacks.lua /usr/lib/metronome/modules/mod_smacks.lua diff --git a/scripts/remove b/scripts/remove index 4abc912..71c64ea 100644 --- a/scripts/remove +++ b/scripts/remove @@ -114,6 +114,13 @@ fi #================================================= ynh_print_info --message="Reconfiguring Metronome..." +# Remove Metronome modules +ynh_secure_remove --file="/usr/lib/metronome/modules/mod_carbons.lua" +ynh_secure_remove --file="/usr/lib/metronome/modules/mod_http_altconnect.lua" +ynh_secure_remove --file="/usr/lib/metronome/modules/mod_smacks.lua" + +ynh_systemd_action --service_name=metronome --action=restart + # Remove domain conf template ynh_secure_remove --file="/usr/share/yunohost/templates/jitsi/$domain.cfg.lua" ynh_secure_remove --file="/usr/share/yunohost/templates/jitsi/auth.$domain.cfg.lua" @@ -130,13 +137,6 @@ fi ynh_secure_remove --file="/usr/share/yunohost/hooks/conf_regen/50-metronome_$app" yunohost tools regen-conf metronome -# Remove Metronome modules -ynh_secure_remove --file="/usr/lib/metronome/modules/mod_carbons.lua" -ynh_secure_remove --file="/usr/lib/metronome/modules/mod_http_altconnect.lua" -ynh_secure_remove --file="/usr/lib/metronome/modules/mod_smacks.lua" - -ynh_systemd_action --service_name=metronome --action=restart - # Delete focus user yunohost user delete $focus_user --purge diff --git a/scripts/restore b/scripts/restore index 2035079..32e5b88 100644 --- a/scripts/restore +++ b/scripts/restore @@ -116,16 +116,19 @@ fi # Create focus user yunohost user create $focus_user -f $focus_user -l $focus_user -m ${focus_user}@auth.$domain -p $focus_password -q 0 -# Restore metronome configuration +# Restore Metronome domain conf template mkdir -p /usr/share/yunohost/templates/jitsi/ ynh_restore_file --origin_path="/usr/share/yunohost/templates/jitsi/$domain.cfg.lua" ynh_restore_file --origin_path="/usr/share/yunohost/templates/jitsi/auth.$domain.cfg.lua" ynh_restore_file --origin_path="/usr/share/yunohost/templates/jitsi/conference.$domain.cfg.lua" ynh_restore_file --origin_path="/usr/share/yunohost/templates/jitsi/jitsi-videobridge.$domain.cfg.lua" ynh_restore_file --origin_path="/usr/share/yunohost/templates/jitsi/focus.$domain.cfg.lua" + +# Restore Metronome Hook ynh_restore_file --origin_path="/usr/share/yunohost/hooks/conf_regen/50-metronome_$app" yunohost tools regen-conf metronome +# Restore Metronome modules ynh_restore_file --origin_path="/usr/lib/metronome/modules/mod_carbons.lua" ynh_restore_file --origin_path="/usr/lib/metronome/modules/mod_http_altconnect.lua" ynh_restore_file --origin_path="/usr/lib/metronome/modules/mod_smacks.lua" diff --git a/scripts/upgrade b/scripts/upgrade index f9075e0..9bfd717 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -46,12 +46,6 @@ if [ -z "$final_path" ]; then fi if ynh_version_gt "1.0.3387~ynh2" "${current_version}" ; then - ynh_secure_remove --file="/etc/metronome/conf.d/$domain.cfg.lua.back" - ynh_secure_remove --file="/etc/metronome/conf.d/auth.$domain.cfg.lua.back" - ynh_secure_remove --file="/etc/metronome/conf.d/conference.$domain.cfg.lua.back" - ynh_secure_remove --file="/etc/metronome/conf.d/jitsi-videobridge.$domain.cfg.lua.back" - ynh_secure_remove --file="/etc/metronome/conf.d/focus.$domain.cfg.lua.back" - # Add Metronome domain conf template metronome_conf="/usr/share/yunohost/templates/jitsi/$domain.cfg.lua" mkdir -p /usr/share/yunohost/templates/jitsi/ @@ -66,6 +60,10 @@ if ynh_version_gt "1.0.3387~ynh2" "${current_version}" ; then touch "/usr/share/yunohost/templates/jitsi/conference.$domain.cfg.lua" touch "/usr/share/yunohost/templates/jitsi/jitsi-videobridge.$domain.cfg.lua" touch "/usr/share/yunohost/templates/jitsi/focus.$domain.cfg.lua" + + # Add Metronome hook + cp -R ../conf/metronome_regen_conf.hook /usr/share/yunohost/hooks/conf_regen/50-metronome_$app + yunohost tools regen-conf metronome fi #=================================================