diff --git a/actions.toml b/actions.toml index 0273bb8..75b4cf9 100644 --- a/actions.toml +++ b/actions.toml @@ -34,17 +34,17 @@ command = "/bin/bash scripts/actions/reset_default_config \"settings.json\"" accepted_return_codes = [0] description = "Reset the config file settings.json." -[public_private] -name = "Move to public or private" -command = "/bin/bash scripts/actions/public_private" -# user = "root" # optional -# cwd = "/" # optional -# accepted_return_codes = [0, 1, 2, 3] # optional -accepted_return_codes = [0] -description = "Change the public access of the app." +# [public_private] +# name = "Move to public or private" +# command = "/bin/bash scripts/actions/public_private" +# # user = "root" # optional +# # cwd = "/" # optional +# # accepted_return_codes = [0, 1, 2, 3] # optional +# accepted_return_codes = [0] +# description = "Change the public access of the app." - [public_private.arguments] - [public_private.arguments.is_public] - type = "boolean" - ask = "Is it a public app?" - default = true +# [public_private.arguments] +# [public_private.arguments.is_public] +# type = "boolean" +# ask = "Is it a public app?" +# default = true diff --git a/check_process b/check_process index 5ea099e..9e83d55 100644 --- a/check_process +++ b/check_process @@ -21,7 +21,7 @@ main.pad_configuration.pad_config_automatic_logout=0|1 main.mypads_configuration.mypads=0|1 main.mypads_configuration.useldap=0|1 - main.is_public.is_public=1|0 + #main.is_public.is_public=1|0 main.overwrite_files.overwrite_settings=0|1 main.overwrite_files.overwrite_credentials=0|1 main.overwrite_files.overwrite_nginx=0|1 diff --git a/config_panel.toml b/config_panel.toml index 7561980..2a5dd93 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -62,14 +62,14 @@ name = "Etherpad configuration" default = true - [main.is_public] - name = "Public access" + # [main.is_public] + # name = "Public access" - [main.is_public.is_public] - ask = "Is it a public website?" - type = "boolean" - default = true - help = "If your Etherpad instance is public, everyone will be able to create a pad or see an existing one." + # [main.is_public.is_public] + # ask = "Is it a public website?" + # type = "boolean" + # default = true + # help = "If your Etherpad instance is public, everyone will be able to create a pad or see an existing one." [main.overwrite_files] diff --git a/scripts/actions/public_private b/scripts/actions/public_private deleted file mode 100755 index 39d6d3b..0000000 --- a/scripts/actions/public_private +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - -source /usr/share/yunohost/helpers - -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -# Get is_public -is_public=${YNH_ACTION_IS_PUBLIC} - -app=$YNH_APP_INSTANCE_NAME - -#================================================= -# CHECK IF ARGUMENTS ARE CORRECT -#================================================= - -#================================================= -# CHECK IF AN ACTION HAS TO BE DONE -#================================================= - -is_public_old=$(ynh_app_setting_get --app=$app --key=is_public) - -if [ $is_public -eq $is_public_old ] -then - ynh_die --message="is_public is already set as $is_public." --ret_code=0 -fi - -#================================================= -# SPECIFIC ACTION -#================================================= -# MOVE TO PUBLIC OR PRIVATE -#================================================= - -if [ $is_public -eq 0 ]; then - public_private="private" -else - public_private="public" -fi -ynh_script_progression --message="Moving the application to $public_private..." --weight=3 - -if [ $is_public -eq 0 ] -then - ynh_app_setting_set --app=$app --key=skipped_uris --value="/admin" # etherpad admin page doesn't support SSO... -else - ynh_app_setting_set --app=$app --key=skipped_uris --value="/" -fi - -ynh_script_progression --message="Upgrading SSOwat configuration..." -# Regen ssowat configuration -yunohost app ssowatconf - -# Update the config of the app -ynh_app_setting_set --app=$app --key=is_public --value=$is_public - -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." - -ynh_systemd_action --service_name=nginx --action=reload - -#================================================= -# END OF SCRIPT -#================================================= - -ynh_script_progression --message="Execution completed" --last diff --git a/scripts/config b/scripts/config index a231fe9..4d4f02c 100644 --- a/scripts/config +++ b/scripts/config @@ -89,7 +89,7 @@ else fi mypads="${YNH_CONFIG_MAIN_MYPADS_CONFIGURATION_MYPADS:-$old_mypads}" -# Ldap for MyPads +# LDAP for MyPads if grep -q "//noldap" $config_file then # Disable @@ -100,9 +100,9 @@ else fi useldap="${YNH_CONFIG_MAIN_MYPADS_CONFIGURATION_USELDAP:-$old_useldap}" -# is_public -old_is_public="$(ynh_app_setting_get --app=$app --key=is_public)" -is_public="${YNH_CONFIG_MAIN_IS_PUBLIC_IS_PUBLIC:-$old_is_public}" +# # is_public +# old_is_public="$(ynh_app_setting_get --app=$app --key=is_public)" +# is_public="${YNH_CONFIG_MAIN_IS_PUBLIC_IS_PUBLIC:-$old_is_public}" # Overwrite settings.json file old_overwrite_settings="$(ynh_app_setting_get --app=$app --key=overwrite_settings)" @@ -140,7 +140,7 @@ show_config() { ynh_return "YNH_CONFIG_MAIN_MYPADS_CONFIGURATION_MYPADS=$mypads" ynh_return "YNH_CONFIG_MAIN_MYPADS_CONFIGURATION_USELDAP=$useldap" - ynh_return "YNH_CONFIG_MAIN_IS_PUBLIC_IS_PUBLIC=$is_public" + #ynh_return "YNH_CONFIG_MAIN_IS_PUBLIC_IS_PUBLIC=$is_public" ynh_return "YNH_CONFIG_MAIN_OVERWRITE_FILES_OVERWRITE_SETTINGS=$overwrite_settings" ynh_return "YNH_CONFIG_MAIN_OVERWRITE_FILES_OVERWRITE_CREDENTIALS=$overwrite_credentials" @@ -297,16 +297,16 @@ apply_config() { # MODIFY PUBLIC ACCESSIBILITY #================================================= - # Change public accessibility - if [ "$is_public" != "$old_is_public" ] - then - if [ "$is_public" = "1" ] - then - yunohost app action run $app public_private --args is_public=1 - else - yunohost app action run $app public_private --args is_public=0 - fi - fi + # # Change public accessibility + # if [ "$is_public" != "$old_is_public" ] + # then + # if [ "$is_public" = "1" ] + # then + # yunohost app action run $app public_private --args is_public=1 + # else + # yunohost app action run $app public_private --args is_public=0 + # fi + # fi #================================================= # MODIFY OVERWRITTING SETTINGS