diff --git a/scripts/config b/scripts/config index 3933054..cb322c7 100644 --- a/scripts/config +++ b/scripts/config @@ -164,32 +164,51 @@ set__auto_join_rooms() { } get__e2e_enabled_by_default() { - e2e_enabled_by_default=$(ynh_app_setting_get --app $app --key e2e_enabled_by_default) - echo "${e2e_enabled_by_default}" + e2e_enabled_by_default=$(ynh_app_setting_get --app $app --key e2e_enabled_by_default) + echo "${e2e_enabled_by_default}" +} + +get__e2e_enabled_by_default_in_element() { + e2e_enabled_by_default_in_element=$(ynh_app_setting_get --app $app --key e2e_enabled_by_default_in_element) + echo "${e2e_enabled_by_default_in_element}" +} + +set__e2e_enabled_by_default() { + ynh_app_setting_set --app=$app --key=e2e_enabled_by_default --value="${e2e_enabled_by_default}" + e2e_enabled_by_default=$(ynh_app_setting_get --app $app --key e2e_enabled_by_default) + + if [ "$e2e_enabled_by_default" = "invite" ] ; then + e2e_enabled_by_default_in_element="true" + ynh_app_setting_set --app=$app --key=e2e_enabled_by_default_in_element --value="${e2e_enabled_by_default_in_element}" + server_name=$(ynh_app_setting_get --app $app --key server_name) + sed -i -r "s|"im\.vector\.riot\.e2ee": \{"default": [A-Za-z]+ \}|"im.vector.riot.e2ee": {"default": ${e2e_enabled_by_default_in_element} }|g" "/etc/nginx/conf.d/${server_name}.d/${app}_server_na> + fi + + if [ "$e2e_enabled_by_default" = "all" ] ; then + e2e_enabled_by_default_in_element="true" + ynh_app_setting_set --app=$app --key=e2e_enabled_by_default_in_element --value="${e2e_enabled_by_default_in_element}" + server_name=$(ynh_app_setting_get --app $app --key server_name) + sed -i -r "s|"im\.vector\.riot\.e2ee": \{"default": [A-Za-z]+ \}|"im.vector.riot.e2ee": {"default": ${e2e_enabled_by_default_in_element} }|g" "/etc/nginx/conf.d/${server_name}.d/${app}_server_na> + fi + + if [ "$e2e_enabled_by_default" = "off" ] ; then + e2e_enabled_by_default_in_element="false" + ynh_app_setting_set --app=$app --key=e2e_enabled_by_default_in_element --value="${e2e_enabled_by_default_in_element}" + server_name=$(ynh_app_setting_get --app $app --key server_name) + sed -i -r "s|"im\.vector\.riot\.e2ee": \{"default": [A-Za-z]+ \}|"im.vector.riot.e2ee": {"default": ${e2e_enabled_by_default_in_element} }|g" "/etc/nginx/conf.d/${server_name}.d/${app}_server_na> + fi + + yunohost service reload nginx } set__e2e_enabled_by_default_in_element() { - if [ "$e2e_enabled_by_default" = "invite" ] ; then - e2e_enabled_by_default_in_element="true" - ynh_app_setting_set --app=$app --key=e2e_enabled_by_default_in_element --value="${e2e_enabled_by_default_in_element}" - sed -i -r "s|"im\.vector\.riot\.e2ee": \{"default": [A-Za-z]+ \}|"im.vector.riot.e2ee": {"default": ${e2e_enabled_by_default_in_element} }|g" "/etc/nginx/conf.d/${server_name}.d/${app}_server_name.conf" - fi - - if [ "$e2e_enabled_by_default" = "all" ] ; then - e2e_enabled_by_default_in_element="true" - ynh_app_setting_set --app=$app --key=e2e_enabled_by_default_in_element --value="${e2e_enabled_by_default_in_element}" - sed -i -r "s|"im\.vector\.riot\.e2ee": \{"default": [A-Za-z]+ \}|"im.vector.riot.e2ee": {"default": ${e2e_enabled_by_default_in_element} }|g" "/etc/nginx/conf.d/${server_name}.d/${app}_server_name.conf" - fi - - if [ "$e2e_enabled_by_default" = "off" ] ; then - e2e_enabled_by_default_in_element="false" - ynh_app_setting_set --app=$app --key=e2e_enabled_by_default_in_element --value="${e2e_enabled_by_default_in_element}" - sed -i -r "s|"im\.vector\.riot\.e2ee": \{"default": [A-Za-z]+ \}|"im.vector.riot.e2ee": {"default": ${e2e_enabled_by_default_in_element} }|g" "/etc/nginx/conf.d/${server_name}.d/${app}_server_name.conf" - fi - - yunohost service reload nginx + ynh_app_setting_set --app=$app --key=e2e_enabled_by_default_in_element --value="${e2e_enabled_by_default_in_element}" + server_name=$(ynh_app_setting_get --app $app --key server_name) + sed -i -r "s|"im\.vector\.riot\.e2ee": \{"default": [A-Za-z]+ \}|"im.vector.riot.e2ee": {"default": ${e2e_enabled_by_default_in_element} }|g" "/etc/nginx/conf.d/${server_name}.d/${app}_server_na> + yunohost service reload nginx } + #================================================= # GENERIC FINALIZATION #=================================================