diff --git a/conf/metronome.cfg.lua b/conf/metronome.cfg.lua index 6b83cf8..06d6225 100644 --- a/conf/metronome.cfg.lua +++ b/conf/metronome.cfg.lua @@ -1,9 +1,3 @@ --- XXX modules that need to be enabled in main config file. ---modules_enabled = { --- "extdisco"; --- "jingle_nodes"; ---}; - external_services = { ["__DOMAIN__"] = { [1] = { diff --git a/scripts/_common.sh b/scripts/_common.sh index 0724f2b..d02d6ae 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -13,6 +13,25 @@ metronome_snippet_path="/etc/metronome/conf.d/coturn.cfg.lua" # PERSONAL HELPERS #================================================= +ynh_metronome_ensure_module_is_enabled() { + module=${1:-admin_telnet} + if ! _metronome_modules_list | grep -qE "^${module}$" ; then + _metronome_module_add ${module} + fi +} + +_metronome_modules_list() { + grep -Ev '^\s*--' /etc/metronome/metronome.cfg.lua \ + | sed -n '/^modules_enabled = {$/,/^\s*};$/p' \ + | grep '\s*"' | sed -r 's/^\s*"([^"]+)";.*/\1/' +} + +_metronome_module_add() { + module=${1:-admin_telnet} + echo "Inserting module ${module}" + sed -i '/^modules_enabled = {/a \ \ "'${module}'"; -- XXX module added by coturn_ynh' /etc/metronome/metronome.cfg.lua +} + #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 35883f7..eb04b65 100644 --- a/scripts/install +++ b/scripts/install @@ -184,10 +184,9 @@ ynh_print_OFF ynh_replace_string --target_file="$metronome_snippet_path" --match_string=__TURNPWD__ --replace_string=$turnserver_pwd ynh_print_ON -# TODO make sure the two following modules are enabled in metronome's main config -# "extdisco"; -# "jingle_nodes"; - +# Make sure the two following modules are enabled in metronome's main config +ynh_metronome_ensure_module_is_enabled extdisco +ynh_metronome_ensure_module_is_enabled jingle_nodes ynh_systemd_action --action="reload" --service_name="metronome" diff --git a/scripts/remove b/scripts/remove index 3378610..a012ea2 100644 --- a/scripts/remove +++ b/scripts/remove @@ -71,6 +71,10 @@ ynh_remove_logrotate #================================================= ynh_secure_remove --file="$metronome_snippet_path" + +# Disable modules +sed -i '/ -- XXX module added by coturn_ynh/d' /etc/metronome/metronome.cfg.lua + ynh_systemd_action --action="reload" --service_name="metronome" #=================================================