diff --git a/CHANGELOG.md b/CHANGELOG.md
index 691cfab..af1de70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
Changelog
=========
+## [1.8.4~ynh3](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/133) - 2021-04-23
+
+#### Changed
+* [Remove page_view plugin (part of the core now)](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/133/commits/def10182c0d7e7aa8a9123e3606203fbd37a20ea)
+* [New permissions](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/133/commits/943ec31536dabe4f2146253f3e478598cdafe4bf)
+
## [1.8.4~ynh1](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/105) - 2020-08-09
#### Changed
diff --git a/README.md b/README.md
index 67a9db7..4d46ddb 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
*[Lire ce readme en français.](./README_fr.md)*
> *This package allow you to install Etherpad quickly and simply on a YunoHost server.
-If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
+If you don't have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.*
## Overview
Etherpad is a highly customizable Open Source online editor providing collaborative editing in really real-time.
@@ -32,7 +32,7 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether
## Documentation
* Official documentation: http://etherpad.org/doc/v1.8.4
- * YunoHost documentation: https://yunohost.org/#/app_etherpad_mypads
+ * YunoHost documentation: https://yunohost.org/en/app_etherpad_mypads
## YunoHost specific features
@@ -43,8 +43,8 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether
#### Supported architectures
-* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/etherpad_mypads/)
-* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/etherpad_mypads/)
+* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/etherpad_mypads/)
+* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/etherpad_mypads/)
## Limitations
@@ -56,13 +56,13 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether
* [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*
* [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Apply colors to fonts*
* [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Add support for Font Sizes*
* [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Adds heading support to Etherpad Lite.*
* [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and Export as Markdown in Etherpad*
* [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad*
- * [ep_page_view](https://www.npmjs.com/package/ep_page_view) - *Add support to do 'page view', with a toggle on/off option in Settings, also Page Breaks with Control Enter*
* [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add support to do 'Spell checking'*
* [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Add support for Subscript and Superscript*
* [ep_table_of_contents](https://www.npmjs.com/package/ep_table_of_contents) - *View a table of contents for your pad*
diff --git a/README_fr.md b/README_fr.md
index ead6f39..8e69c05 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -6,7 +6,7 @@
*[Read this readme in english.](./README.md)*
> *Ce package vous permet d'installer Etherpad rapidement et simplement sur un serveur YunoHost.
-Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/install_fr) pour savoir comment l'installer et en profiter.*
+Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/install_fr) pour savoir comment l'installer et en profiter.*
## Résumé
Etherpad est un éditeur en ligne Open Source hautement personnalisable qui permet l'édition collaborative en temps réel.
@@ -31,7 +31,7 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa
## Documentation
* Documentation officielle : http://etherpad.org/doc/v1.8.4
- * Documentation YunoHost : https://yunohost.org/#/app_etherpad_mypads_fr
+ * Documentation YunoHost : https://yunohost.org/fr/app_etherpad_mypads
## Fonctionnalités spécifiques à YunoHost
@@ -42,8 +42,8 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa
#### Architectures supportées
-* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/etherpad_mypads/)
-* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/etherpad_mypads/)
+* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/etherpad_mypads/)
+* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/etherpad_mypads/)
## Limitations
@@ -55,13 +55,13 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa
* [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*
* [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Appliquer les couleurs aux polices de caractères*
* [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Permet de définir la taille de la police*.
* [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Ajoute le support de titre à Etherpad Lite.*
* [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Modifier et exporter en tant que Markdown dans Etherpad*
* [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groupes et pads privés pour etherpad*
- * [ep_page_view](https://www.npmjs.com/package/ep_page_view) - *Ajouter la prise en charge de 'page view', avec une option d'activation/désactivation dans Paramètres, ainsi que 'Page Breaks' avec Control + Entrée*
* [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Ajouter le support pour faire de la vérification orthographique*
* [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Ajouter la prise en charge de Subscript et Superscript*.
* [ep_table_of_contents](https://www.npmjs.com/package/ep_table_of_contents) - *Voir une table des matières pour votre pad*
diff --git a/check_process b/check_process
index 8672ecd..5d974b2 100644
--- a/check_process
+++ b/check_process
@@ -1,4 +1,4 @@
-;; Test complet avec libreoffice et mypads
+;; Test complet avec LibreOffice et MyPads
; Manifest
domain="domain.tld" (DOMAIN)
path="/path" (PATH)
@@ -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_pageview=1|0
main.pad_configuration.pad_config_automatic_logout=0|1
main.pad_configuration.pad_config_skinname=noskin|colibris|noskin
main.mypads_configuration.mypads=0|1
@@ -38,11 +37,10 @@
upgrade=1
backup_restore=1
multi_instance=1
- port_already_use=1 (9001)
change_url=1
actions=1
config_panel=1
-;; Test sans mypads
+;; Test sans MyPads
; Manifest
domain="domain.tld" (DOMAIN)
path="/path" (PATH)
@@ -58,7 +56,7 @@
setup_root=1
upgrade=1
backup_restore=1
-;; Test abiword
+;; Test Abiword
; Manifest
domain="domain.tld" (DOMAIN)
path="/" (PATH)
@@ -71,7 +69,7 @@
useldap=0
; Checks
setup_root=1
- upgrade=1 from_commit=8bf300413ec3adcb416d168d2e9e98975dd9405b
+ upgrade=1 from_commit=978e77403a6d8e9512ec1f5203e9834e945c2d8c
;; Test sans export
; Manifest
domain="domain.tld" (DOMAIN)
@@ -89,6 +87,6 @@
Email=
Notification=change
;;; Upgrade options
- ; commit=8bf300413ec3adcb416d168d2e9e98975dd9405b
- name= Fix nodejs & global update
+ ; commit=978e77403a6d8e9512ec1f5203e9834e945c2d8c
+ name= #113
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&password=password&language=en&is_public=1&abiword=0&
diff --git a/conf/settings.json b/conf/settings.json
index 6c65f50..13cd91d 100644
--- a/conf/settings.json
+++ b/conf/settings.json
@@ -211,10 +211,6 @@
// ep_markdown
"ep_markdown_default": false, // Setting as default
- // ep_page_view
- "ep_page_view_default" : false, // Set page view as default
- "ep_page_view_disable_change" : false, // Disable change of page view setting in UI
-
// Other plugins config
// ep_comments_page
// Display comments as icons, not boxes
diff --git a/config_panel.toml b/config_panel.toml
index 7045e5f..8b1f163 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -42,11 +42,6 @@ name = "Etherpad configuration"
type = "boolean"
default = false
- [main.pad_configuration.pad_config_pageview]
- ask = "Page view?"
- type = "boolean"
- default = false
-
[main.pad_configuration.pad_config_automatic_logout]
ask = "Automatic logout"
type = "boolean"
diff --git a/manifest.json b/manifest.json
index 7e66103..839be8b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
"en": "Online editor providing collaborative editing in real-time.",
"fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel."
},
- "version": "1.8.4~ynh2",
+ "version": "1.8.4~ynh3",
"url": "https://framapad.org",
"license": "Apache-2.0",
"maintainer": {
@@ -18,7 +18,7 @@
"email": "maniackc_dev@crudelis.fr"
}],
"requirements": {
- "yunohost": ">= 3.8.1"
+ "yunohost": ">= 4.1.7"
},
"multi_instance": true,
"services": [
@@ -30,38 +30,22 @@
{
"name": "domain",
"type": "domain",
- "ask": {
- "en": "Choose a domain for Etherpad MyPads",
- "fr": "Choisissez un domaine pour Etherpad MyPads"
- },
"example": "sub.domain.org"
},
{
"name": "path",
"type": "path",
- "ask": {
- "en": "Choose a path for Etherpad MyPads",
- "fr": "Choisissez un chemin pour Etherpad MyPads"
- },
"example": "/pad",
"default": "/pad"
},
{
"name": "admin",
"type": "user",
- "ask": {
- "en": "Choose the Etherpad MyPads administrator (must be an existing YunoHost user)",
- "fr": "Choisissez l'administrateur Etherpad MyPads (doit être un utilisateur YunoHost existant)"
- },
"example": "john"
},
{
"name": "password",
"type": "password",
- "ask": {
- "en": "Set the administrator password (between 8 and 30 characters)",
- "fr": "Définissez le mot de passe administrateur (entre 8 et 30 caractères)"
- },
"example": "Choose a password"
},
{
@@ -71,16 +55,12 @@
"en": "Choose your language",
"fr": "Choisissez la langue"
},
- "choices" : ["en", "fr"],
+ "choices" : ["de", "en", "es", "fr", "it"],
"default" : "en"
},
{
"name": "is_public",
"type": "boolean",
- "ask": {
- "en": "Is it a public website?",
- "fr": "Est-ce un site public ?"
- },
"help": {
"en": "If your Etherpad instance is public, everyone will be able to create a pad or see an existing one.",
"fr": "Si votre instance Etherpad est publique, tout le monde pourra créer un pad ou voir un pad existant."
@@ -105,7 +85,7 @@
"fr": "Voulez-vous installer le plugin MyPads ?"
},
"help": {
- "en": "mypads plugin"
+ "en": "MyPads plugin"
},
"default": true
},
diff --git a/pull_request_template.md b/pull_request_template.md
index d7cd620..6c28fc5 100644
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -11,13 +11,6 @@
- [ ] Upgrade from last version tested.
- [ ] Can be reviewed and tested.
-## Validation
+## Package_check results
---
-*Minor decision*
-- [ ] **Code review** :
-- [ ] **Approval (LGTM)** :
-*Code review and approval have to be from a member of @YunoHost-Apps/apps-group*
-- **CI succeeded** :
-[](https://ci-apps-hq.yunohost.org/jenkins/job/etherpad_mypads_ynh%20PR-NUM-/)
-*Please replace '-NUM-' in this link by the PR number.*
-When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.
+* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*
diff --git a/scripts/_variables b/scripts/_variables
index 70a9eb8..4e07d29 100644
--- a/scripts/_variables
+++ b/scripts/_variables
@@ -18,7 +18,7 @@ ep_align_version=0.2.5
ep_author_hover_version=0.3.0
ep_automatic_logut_version=1.0.8
ep_comments_page_version=0.1.5
-#ep_countable_version=0.0.7
+ep_countable_version=0.0.11
ep_delete_empty_pads_version=0.0.6
ep_font_color_version=0.0.15
ep_headings2_version=0.1.3
diff --git a/scripts/config b/scripts/config
index 98ab80c..ffbe98e 100644
--- a/scripts/config
+++ b/scripts/config
@@ -67,10 +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}"
-# Plugin option ep_page_view_default
-old_pad_config_pageview="$(get_config_value ep_page_view_default)"
-pad_config_pageview="${YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_PAGEVIEW:-$old_pad_config_pageview}"
-
# Enable/disable ep_automatic_logut
if grep -q "//.*\"automatic_logut_" $config_file
then
@@ -149,7 +145,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_PAGEVIEW=$pad_config_pageview"
ynh_return "YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_AUTOMATIC_LOGOUT=$pad_config_automatic_logout"
ynh_return "YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_SKINNAME=$pad_config_skinname"
@@ -217,14 +212,6 @@ apply_config() {
restart_etherpad=1
fi
- # Plugin option ep_page_view_default
- if [ "$pad_config_pageview" != "$old_pad_config_pageview" ]
- then
- ynh_replace_string --match_string="\(\"ep_page_view_default\" *: \).*," --replace_string="\1$pad_config_pageview," --target_file="$config_file"
- ynh_app_setting_set --app=$app --key=pad_config_pageview --value="$pad_config_pageview"
- restart_etherpad=1
- fi
-
# Plugin option ep_automatic_logut
if [ "$pad_config_automatic_logout" != "$old_pad_config_automatic_logout" ]
then
diff --git a/scripts/install b/scripts/install
index b3532a4..4541af0 100644
--- a/scripts/install
+++ b/scripts/install
@@ -65,7 +65,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=3
ynh_app_setting_set --app=$app --key=domain --value=$domain
ynh_app_setting_set --app=$app --key=path --value=$path_url
ynh_app_setting_set --app=$app --key=admin --value=$admin
-ynh_app_setting_set --app=$app --key=is_public --value=$is_public
ynh_print_OFF; ynh_app_setting_set --app=$app --key=password --value=$password; ynh_print_ON
ynh_app_setting_set --app=$app --key=language --value=$language
ynh_app_setting_set --app=$app --key=export --value=$export
@@ -233,7 +232,7 @@ ynh_add_systemd_config
# ADVERTISE SERVICE IN ADMIN PANEL
#=================================================
-yunohost service add $app --log "/var/log/$app/etherpad.log"
+yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/etherpad.log"
#=================================================
# INSTALL FRAMAPAD'S PLUGINS
@@ -263,8 +262,6 @@ if [ $mypads -eq 1 ]; then
# Framapad - Groups and private pads for etherpad
npm install ep_mypads@${mypads_version} >> $install_log 2>&1
fi
-# Framapad - Add support to do 'page view', with a toggle on/off option in Settings, also Page Breaks with Control Enter
-npm install ep_page_view@${ep_page_view_version} >> $install_log 2>&1
# Framapad - Add support to do 'Spell checking'
npm install ep_spellcheck@${ep_spellcheck_version} >> $install_log 2>&1
# Framapad - Add support for Subscript and Superscript
@@ -292,7 +289,7 @@ then
# Find the /div just after the field to open a pad
mod_line=$(grep -nA5 "index.createOpenPad" $final_path/src/templates/index.html | grep "" | cut -d '-' -f 1)
# In order to add a link to mypads plugin.
- sed -i "$mod_line s@div>@&\n\t
Mypads@" $final_path/src/templates/index.html
+ sed -i "$mod_line s@div>@&\n\t
MyPads@" $final_path/src/templates/index.html
fi
#=================================================
@@ -306,15 +303,15 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failrege
#=================================================
# SETUP SSOWAT
#=================================================
-ynh_script_progression --message="Configuring SSOwat..."
+ynh_script_progression --message="Configuring permissions..." --weight=2
if [ $is_public -eq 1 ]; then
- ynh_app_setting_set --app=$app --key=skipped_uris --value="/"
-else
- # etherpad admin page doesn't support SSO...
- ynh_app_setting_set --app=$app --key=skipped_uris --value="/admin"
+ ynh_permission_update --permission="main" --add="visitors"
fi
+# Etherpad admin page doesn't support SSO...
+ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin
+
#=================================================
# RELOAD NGINX
#=================================================
diff --git a/scripts/remove b/scripts/remove
index 5507df8..60f8e32 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -95,7 +95,7 @@ ynh_remove_logrotate
#=================================================
# REMOVE FAIL2BAN CONFIGURATION
#=================================================
-ynh_script_progression --message="Removing Fail2ban configuration..." --weight=7
+ynh_script_progression --message="Removing Fail2Ban configuration..." --weight=7
# Remove the dedicated fail2ban config
ynh_remove_fail2ban_config
diff --git a/scripts/restore b/scripts/restore
index 248d03c..d4da3c7 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -141,7 +141,7 @@ chown -R $app: $final_path
# ADVERTISE SERVICE IN ADMIN PANEL
#=================================================
-yunohost service add $app --log "/var/log/$app/etherpad.log"
+yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/etherpad.log"
#=================================================
# RESTORE SYSTEMD
diff --git a/scripts/upgrade b/scripts/upgrade
index 23f0a3b..8d4de8c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,7 +23,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
path_url=$(ynh_app_setting_get --app=$app --key=path)
admin=$(ynh_app_setting_get --app=$app --key=admin)
language=$(ynh_app_setting_get --app=$app --key=language)
-is_public=$(ynh_app_setting_get --app=$app --key=is_public)
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
port=$(ynh_app_setting_get --app=$app --key=port)
export=$(ynh_app_setting_get --app=$app --key=export)
@@ -57,15 +56,6 @@ upgrade_type=$(ynh_check_app_version_changed)
#=================================================
ynh_script_progression --message="Ensuring downward compatibility..." --weight=2
-# Fix is_public as a boolean value
-if [ "$is_public" = "Yes" ]; then
- ynh_app_setting_set --app=$app --key=is_public --value=1
- is_public=1
-elif [ "$is_public" = "No" ]; then
- ynh_app_setting_set --app=$app --key=is_public --value=0
- is_public=0
-fi
-
# If db_name doesn't exist, create it
if [ -z "$db_name" ]; then
db_name=$(ynh_sanitize_dbid --db_name=$app)
@@ -135,6 +125,18 @@ if [ -z "$overwrite_systemd" ]; then
ynh_app_setting_set $app overwrite_systemd $overwrite_systemd
fi
+# Cleaning legacy permissions
+if ynh_legacy_permissions_exists; then
+ ynh_legacy_permissions_delete_all
+
+ ynh_app_setting_delete --app=$app --key=is_public
+fi
+
+if ! ynh_permission_exists --permission="admin"; then
+ # Create the required permissions
+ ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin
+fi
+
#=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#=================================================
@@ -354,6 +356,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path
# Set files ownership to etherpad
chown -R $app: $final_path
+
chmod 600 "$final_path/credentials.json"
# Restrict access to credentials.json
chown $app -R /var/log/$app/etherpad.log
@@ -362,7 +365,7 @@ chown $app -R /var/log/$app/etherpad.log
# ADVERTISE SERVICE IN ADMIN PANEL
#=================================================
-yunohost service add $app --log "/var/log/$app/etherpad.log"
+yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/etherpad.log"
#=================================================
# UPGRADE FAIL2BAN
@@ -401,20 +404,7 @@ then
# Find the /div just after the field to open a pad
mod_line=$(grep -nA5 "index.createOpenPad" $final_path/src/templates/index.html | grep "" | cut -d '-' -f 1)
# In order to add a link to mypads plugin.
- sed -i "$mod_line s@div>@&\n\t
Mypads@" $final_path/src/templates/index.html
-fi
-
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_script_progression --message="Upgrading SSOwat configuration..."
-
-# Make app public if necessary
-if [ $is_public -eq 1 ]; then
- ynh_app_setting_set --app=$app --key=skipped_uris --value="/"
-else
- # etherpad admin page doesn't support SSO...
- ynh_app_setting_set --app=$app --key=skipped_uris --value="/admin"
+ sed -i "$mod_line s@div>@&\n\t
MyPads@" $final_path/src/templates/index.html
fi
#=================================================