remove action public_private

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]
+# [public_private]
-name = "Move to public or private"
+# name = "Move to public or private"
-command = "/bin/bash scripts/actions/public_private"
+# command = "/bin/bash scripts/actions/public_private"
-# user = "root"  # optional
+# # user = "root"  # optional
-# cwd = "/" # optional
+# # cwd = "/" # optional
-# accepted_return_codes = [0, 1, 2, 3]  # optional
+# # accepted_return_codes = [0, 1, 2, 3]  # optional
-accepted_return_codes = [0]
+# accepted_return_codes = [0]
-description = "Change the public access of the app."
+# description = "Change the public access of the app."
 
-    [public_private.arguments]
+#     [public_private.arguments]
-        [public_private.arguments.is_public]
+#         [public_private.arguments.is_public]
-            type = "boolean"
+#             type = "boolean"
-            ask = "Is it a public app?"
+#             ask = "Is it a public app?"
-            default = true
+#             default = true

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

config_panel.toml

@@ -62,14 +62,14 @@ name = "Etherpad configuration"
         default = true
 
 
-    [main.is_public]
+    # [main.is_public]
-    name = "Public access"
+    # name = "Public access"
 
-        [main.is_public.is_public]
+    #     [main.is_public.is_public]
-        ask = "Is it a public website?"
+    #     ask = "Is it a public website?"
-        type = "boolean"
+    #     type = "boolean"
-        default = true
+    #     default = true
-        help = "If your Etherpad instance is public, everyone will be able to create a pad or see an existing one."
+    #     help = "If your Etherpad instance is public, everyone will be able to create a pad or see an existing one."
 
 
     [main.overwrite_files]

scripts/actions/public_private

@@ -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

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
+# # is_public
-old_is_public="$(ynh_app_setting_get --app=$app --key=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="${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
+	# # Change public accessibility
-	if [ "$is_public" != "$old_is_public" ]
+	# if [ "$is_public" != "$old_is_public" ]
-	then
+	# then
-        if [ "$is_public" = "1" ]
+ #        if [ "$is_public" = "1" ]
-        then
+ #        then
-            yunohost app action run $app public_private --args is_public=1
+ #            yunohost app action run $app public_private --args is_public=1
-        else
+ #        else
-            yunohost app action run $app public_private --args is_public=0
+ #            yunohost app action run $app public_private --args is_public=0
-        fi
+ #        fi
-	fi
+	# fi
 
     #=================================================
     # MODIFY OVERWRITTING SETTINGS