From d0fb6f963575161fc5ff01d570e4cc3ab1642c25 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 14 May 2021 15:47:26 +0200 Subject: [PATCH] Remove automatic_logut --- README.md | 1 - README_fr.md | 1 - check_process | 1 - conf/settings.json | 3 --- config_panel.toml | 5 ----- scripts/_variables | 1 - scripts/config | 31 ------------------------------- scripts/install | 2 -- scripts/upgrade | 2 -- 9 files changed, 47 deletions(-) diff --git a/README.md b/README.md index 79dc6fc..99de54d 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,6 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether * [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify to lines of text in a pad* * [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Adds author names to span titles* - * [ep_automatic_logut](https://www.npmjs.com/package/ep_automatic_logut) - *Automatically disconnects user after some period of time (Prevent server overload)* * [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Adds comments on sidebar and link it to the text.* * [ep_countable](https://www.npmjs.com/package/ep_countable) - *Adds paragraphs, words and characters count* * [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited* diff --git a/README_fr.md b/README_fr.md index f1d4c03..ba99ff8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -53,7 +53,6 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa * [ep_align](https://www.npmjs.com/package/ep_align) - *Ajoute Gauche/Centre/Droite/Justifier à des lignes de texte dans un pad* * [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Ajoute des noms d'auteurs* - * [ep_automatic_logut](https://www.npmjs.com/package/ep_automatic_logut) - *Déconnecte automatiquement l'utilisateur après une certaine période de temps (Prévient la surcharge du serveur)* * [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Ajoute des commentaires sur la sidebar et le lie au texte.* * [ep_countable](https://www.npmjs.com/package/ep_countable) - *Ajoute l'afficher le nombre de paragraphes, de mots et de caractères* * [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Supprimer les pads qui n'ont jamais été édités* diff --git a/check_process b/check_process index 8330d8b..ea0c788 100644 --- a/check_process +++ b/check_process @@ -18,7 +18,6 @@ main.pad_configuration.pad_config_chatandusers=1|0 main.pad_configuration.pad_config_alwaysshowchat=1|0 main.pad_configuration.pad_config_show_markdown=1|0 - main.pad_configuration.pad_config_automatic_logout=0|1 main.mypads_configuration.mypads=0|1 main.mypads_configuration.useldap=0|1 main.overwrite_files.overwrite_settings=0|1 diff --git a/conf/settings.json b/conf/settings.json index 8eee7b0..7b60186 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -204,9 +204,6 @@ }, // Plugins config - // ep_automatic_logut - "automatic_logut_mins_show" : true, // Show logout time selector - "automatic_logut_url" : "../../", // Redirection URL address // ep_markdown "ep_markdown_default": false, // Setting as default diff --git a/config_panel.toml b/config_panel.toml index 631ba72..232f6f5 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -41,11 +41,6 @@ name = "Etherpad configuration" ask = "Show markdown syntax?" type = "boolean" default = false - - [main.pad_configuration.pad_config_automatic_logout] - ask = "Automatic logout" - type = "boolean" - default = true [main.mypads_configuration] diff --git a/scripts/_variables b/scripts/_variables index e89bc02..ffb16a7 100644 --- a/scripts/_variables +++ b/scripts/_variables @@ -16,7 +16,6 @@ mypads_version=1.7.20 # Plugin versions ep_align_version=0.3.34 ep_author_hover_version=0.3.19 -ep_automatic_logut_version=1.0.8 ep_comments_page_version=0.1.60 ep_countable_version=0.0.11 ep_delete_empty_pads_version=0.0.7 diff --git a/scripts/config b/scripts/config index 41f406d..1fc45da 100644 --- a/scripts/config +++ b/scripts/config @@ -67,17 +67,6 @@ pad_config_alwaysshowchat="${YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_ALWAYS old_pad_config_show_markdown="$(get_config_value ep_markdown_default)" pad_config_show_markdown="${YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_SHOW_MARKDOWN:-$old_pad_config_show_markdown}" -# Enable/disable ep_automatic_logut -if grep -q "//.*\"automatic_logut_" $config_file -then - # Disable - old_pad_config_automatic_logout=0 -else - # Enable - old_pad_config_automatic_logout=1 -fi -pad_config_automatic_logout="${YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_AUTOMATIC_LOGOUT:-$old_pad_config_automatic_logout}" - # MyPads if [ -d $final_path/node_modules/ep_mypads ] then @@ -131,7 +120,6 @@ show_config() { ynh_return "YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_CHATANDUSERS=$pad_config_chatandusers" ynh_return "YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_ALWAYSSHOWCHAT=$pad_config_alwaysshowchat" ynh_return "YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_SHOW_MARKDOWN=$pad_config_show_markdown" - ynh_return "YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_AUTOMATIC_LOGOUT=$pad_config_automatic_logout" ynh_return "YNH_CONFIG_MAIN_MYPADS_CONFIGURATION_MYPADS=$mypads" ynh_return "YNH_CONFIG_MAIN_MYPADS_CONFIGURATION_USELDAP=$useldap" ynh_return "YNH_CONFIG_MAIN_OVERWRITE_FILES_OVERWRITE_SETTINGS=$overwrite_settings" @@ -193,25 +181,6 @@ apply_config() { restart_etherpad=1 fi - # Plugin option ep_automatic_logut - if [ "$pad_config_automatic_logout" != "$old_pad_config_automatic_logout" ] - then - ynh_use_nodejs - #pushd "$final_path/src" - #ynh_secure_remove --file="$final_path/src/package-lock.json" #added to fix saveError ENOENT: no such file or directory - if [ "$pad_config_automatic_logout" = "0" ] - then - ynh_replace_string --match_string="^\(.*\"automatic_logut.*$\)" --replace_string="\/\/\1" --target_file="$config_file" - ynh_exec_as $app env "$ynh_node_load_PATH" npm uninstall ep_automatic_logut - else - ynh_replace_string --match_string="^\/\/\(.*\"automatic_logut.*$\)" --replace_string="\1" --target_file="$config_file" - ynh_exec_as $app env "$ynh_node_load_PATH" npm install ep_automatic_logut@${ep_automatic_logut_version} - fi - popd - chown -R $app: $final_path/node_modules - restart_etherpad=1 - fi - # Export if [ "$export" != "$old_export" ] then diff --git a/scripts/install b/scripts/install index c173260..e36a011 100644 --- a/scripts/install +++ b/scripts/install @@ -238,8 +238,6 @@ pushd "$final_path" ynh_npm install ep_align@${ep_align_version} >> $install_log 2>&1 # Framapad - Adds author names to span titles ynh_npm install ep_author_hover@${ep_author_hover_version} >> $install_log 2>&1 -# Automatically disconnects user after some period of time (Prevent server overload) -ynh_npm install ep_automatic_logut@${ep_automatic_logut_version} >> $install_log 2>&1 # Framapad - Adds comments on sidebar and link it to the text. ynh_npm install ep_comments_page@${ep_comments_page_version} >> $install_log 2>&1 # Framapad - Displays paragraphs, sentences, words and characters counts. diff --git a/scripts/upgrade b/scripts/upgrade index 2808387..e75b541 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -291,8 +291,6 @@ pushd "$final_path" ynh_npm install ep_align@${ep_align_version} >> $install_log 2>&1 # Framapad - Adds author names to span titles ynh_npm install ep_author_hover@${ep_author_hover_version} >> $install_log 2>&1 -# Automatically disconnects user after some period of time (Prevent server overload) -ynh_npm install ep_automatic_logut@${ep_automatic_logut_version} >> $install_log 2>&1 # Framapad - Adds comments on sidebar and link it to the text. ynh_npm install ep_comments_page@${ep_comments_page_version} >> $install_log 2>&1 # Framapad - Displays paragraphs, sentences, words and characters counts.