diff --git a/README.md b/README.md index c7ad294..e56616e 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Or, you can find a config file for etherpad at this path `/var/www/etherpad_mypa #### Multi-users support -Supported, **without LDAP nor SSO**. +Supported, with LDAP. #### Supported architectures diff --git a/README_fr.md b/README_fr.md index 8557171..bf4741b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,7 +32,7 @@ Ou, vous pouvez trouver un fichier de configuration pour etherpad à `/var/www/e #### Support multi-utilisateurs -Supportée, **sans LDAP ni SSO**. +Supportée, avec LDAP. #### Architectures supportées. diff --git a/YEP.md b/YEP.md index 1d2227d..e6627b2 100644 --- a/YEP.md +++ b/YEP.md @@ -32,7 +32,7 @@ #### [Level 4](https://github.com/YunoHost/doc/blob/master/packaging_apps_levels_fr.md#niveau-4) [YEP 4.1 - Lier au ldap](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-41) -`Not yet validated` +`Validated` [YEP 4.2 - Lier l'authentification au sso](https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-42) `Not yet validated` diff --git a/check_process b/check_process index e82c8e4..c160fa4 100644 --- a/check_process +++ b/check_process @@ -69,9 +69,8 @@ Level 1=auto Level 2=auto Level 3=auto -# Level 4: Pas de support ldap. https://framagit.org/framasoft/ep_mypads/issues/31#note_30898 - Level 4=na -# Level 5: https://github.com/YunoHost-Apps/etherpad_mypads_ynh/issues/11 +# Level 4: https://github.com/YunoHost-Apps/etherpad_mypads_ynh/blob/51ddcd64d68398018e3af6637339e2c20c4dc9a7/conf/settings.json#L90-L113 + Level 4=1 Level 5=auto Level 6=auto Level 7=auto diff --git a/scripts/install b/scripts/install index 2cee0a7..abbc403 100644 --- a/scripts/install +++ b/scripts/install @@ -295,26 +295,19 @@ fi if [ $mypads -eq 1 ] then - Informations1="You can access 2 different admin panels, for etherpad by accessing https://$domain${path_url%/}/admin and for mypads by accessing https://$domain${path_url%/}/mypads/?/admin." - - Informations2=" -Because there's no LDAP support with mypads plugin, no user is created at the installation. -You have to connect to the admin panel to create the first users. -" + Informations="You can access 2 different admin panels, for etherpad by accessing https://$domain${path_url%/}/admin and for mypads by accessing https://$domain${path_url%/}/mypads/?/admin." else - Informations1="You can access the admin panel by accessing https://$domain${path_url%/}/admin." - - Informations2="" + Informations="You can access the admin panel by accessing https://$domain${path_url%/}/admin." fi ynh_print_OFF -message="$Informations1 +message="$Informations Or, you can find a config file for etherpad at this path /var/www/etherpad_mypads/settings.json. Your credentials for the admin panel are: - login : $admin - password : $password -$Informations2 + If you are facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/etherpad_mypads_ynh" ynh_send_readme_to_admin "$message" "$admin" diff --git a/scripts/restore b/scripts/restore index 2a9ae04..abea9fe 100644 --- a/scripts/restore +++ b/scripts/restore @@ -160,26 +160,19 @@ ynh_check_starting "You can access your Etherpad instance at" "/var/log/$app/eth if [ $mypads -eq 1 ] then - Informations1="You can access 2 different admin panels, for etherpad by accessing https://$domain${path_url%/}/admin and for mypads by accessing https://$domain${path_url%/}/mypads/?/admin." - - Informations2=" -Because there's no ldap support with mypads plugin, no user is created at the installation. -You have to connect to the admin panel to create the first users. -" + Informations="You can access 2 different admin panels, for etherpad by accessing https://$domain${path_url%/}/admin and for mypads by accessing https://$domain${path_url%/}/mypads/?/admin." else - Informations1="You can access to the admin panel, by accessing https://$domain${path_url%/}/admin." - - Informations2="" + Informations="You can access to the admin panel, by accessing https://$domain${path_url%/}/admin." fi ynh_print_OFF -message="$Informations1 +message="$Informations Or, you can find a config file for etherpad at this path /var/www/etherpad_mypads/settings.json. Your credentials for the admin panel are: - login : $admin - password : $password -$Informations2 + If you are facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/etherpad_mypads_ynh" ynh_send_readme_to_admin "$message" "$admin"