diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index d848fff..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,132 +0,0 @@ -Changelog -========= - -## [1.8.18~ynh2]() - 2022-07-26 - -#### Fixed -* [Fix unicode support](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/174/commits/f9afcc4447fc2ec97355622645023a56551e3d4b) - - -## [1.8.18~ynh1]() - 2022-07-18 - -#### Changed -* [Upgrade to 1.8.18](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/171) - - -## [1.8.17~ynh1]() - 2022-02-24 - -#### Changed -* [Upgrade to 1.8.17](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/160/commits/4c6951773bc4cf7955bc1b7407973cacc7db9302) -* [Upgrade plugins to upstream](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/160/commits/5a4944af34fb09c1e915bd43edc0de5ac8bf6538) - - -## [1.8.16~ynh2]() - 2021-12-21 - -#### Changed -* [Upgrade to 1.8.16 (for real)](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/159/commits/d08a7d53b0b350dcbbdd983d421c68c2eb065c34) -* [Upgrade plugins to upstream](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/159/commits/e4929cf6e31b71970a24165845365c2342d1fd61) - -## [1.8.16~ynh1]() - 2021-12-09 - -#### Changed -* [Upgrade to 1.8.16](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/157/commits/e82f22685697428a0f24b15a9682dd075d0c5223) -* [Upgrade ep_comments_page to 0.1.80](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/157/commits/0395fb13763a14ad6a85967809da7473f030f58c) - -## [1.8.15~ynh1]() - 2021-11-20 - -#### Changed -* [Upgrade to 1.8.15](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/154/commits/d176478017e8524984657f302262516901cdc427) -* [Upgrade plugins to upstream](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/154/commits/2f7e3e25ec9e7d7e48a8d14742a8cf081e56a8b4) -* [Set YunoHost requirements to 4.3.0](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/154/commits/51a380c77711fdd70eb36a34a1af4a50e8b840a6) -* [Add more language (gl, hu, nl, pt)](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/154/commits/63a460165ad9d5bb754d8954fdf69a098e3bf35b) - -## [1.8.14~ynh2]() - 2021-10-01 - -#### Changed -* [Harden systemd](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/149/commits/5900064ea950d98c0bf28e336a5e2d85012e5e52) -* [Fix login to admin page](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/149/commits/3659fb84bcd52d16937a25998395e7889a731412) -* [Add autoupdate mecanism](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/149/commits/b53b5830e5c3521db00fe2f4c8b8c1d953e5664a) -* [Code clean up](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/149/commits/e4168cde0a8611a09ff5bfea6059bdc98a36af38) - -## [1.8.14~ynh1]() - 2021-06-04 - -#### Changed -* [Upgrade to 1.8.14](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/commit/452b42c106f9e67f84165e1f62ba7cc516240351) -* [Update to MyPads 1.7.21](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/commit/678da97ecac67491028cdeba1493ba11650b992b) -* [Upgrade plugins to upstream](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/commit/34d5d0a002c3ca74c8151d365efaaba0e6fb96b2) - -## [1.8.13~ynh2]() - 2021-05-14 - -#### Disabled -* [ep_automatic_logut plugin](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/140/files) - -## [1.8.13~ynh1]() - 2021-03-23 - -#### Changed -* [Upgrade to 1.8.13](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/commit/9684b59824b18ea781efb8a26df5d7c3d51a8264) -* [Upgrade NodeJS to 14](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/commit/5d3ce9996e3f4d0812b000467e5ae2d9ee5416e0) -* [Update to MyPads 1.7.20]() -* [Upgrade plugins to upstream](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/commit/943ec31536dabe4f2146253f3e478598cdafe4bf) - -#### Added -* [ep_countable plugin (working again)](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/commit/5d3ce9996e3f4d0812b000467e5ae2d9ee5416e0) - -## [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 -* [Upgrade to 1.8.4](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/105/commits/db2ffa6fc5ebac447410e1018c9b3d1bd3be79a2) -* [Update to MyPads 1.7.17](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/105/commits/db2ffa6fc5ebac447410e1018c9b3d1bd3be79a2) -* [Upgrade packages to upstream](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/105/commits/28f2069099fe81d8c9b188e3461494323e437cfe) -* [Set colibris as skin default](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/105/commits/5201c05185b8e65635267a73339fe9d3ce255a4f) - -#### Disabled -* [ep_countable plugin (not working with this version)](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/105/commits/0a0d26cc5cadb5d51ae0e8dbbef41c9488af2433) - -## [1.8.0~ynh1](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/74) - 2019-10-08 - -#### Added -* [Add actions and config-panel](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/49) -* [Add changelog](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/76) - -#### Fixed -* [Show a link to mypads only if installed](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/74/commits/46b50b32e58edfb74c143fe5a50362629294f50b) - -#### Changed -* [Upgrade to 1.8.0](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/78) -* [Update to mypads 1.7.10](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/74/commits/00060c99db7f0fcac57c910256a37b6deeb8c2fe) -* [Allow to enable or disable automatic logout](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/74/commits/fdc8d6cbdd8eb0931336311d53857dad7f966d93) - -## [1.7.5~ynh2](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/69) - 2019-05-26 - -#### Changed -* [Upgrade to Etherpad 1.7.5](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/69/commits/d299b77dd865e9fff306c121235450e27ab9372a) - - -## [1.7.0~ynh2](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63) - 2019-03-29 - -#### Added -- [Progress bar](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/4489e07a059477802cfeb402e1980b79e1ddce97) - -#### Fixed -* [Fix regression on ynh_system_user_create](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/c0de9b2ee3ebc5ecb11e02655984e1fe793dd9d5) - -#### Changed -* [Update to last standart](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/c663ec74c1d97cccbc1291a9d3e74cdf3b7586e9) -* [Update to mypads 1.7.6](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/c87caaad6507a52a71572ef21529cc4f1022b53b) -* [Update helpers](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/bab779a39f3f6f45c0fcc6bdf640baa47a5e6821) -* [Allow to include a pad in an other page](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/f27cca79957f88fd9972452db146fe6867ba3f79) - - -## [1.7.0~ynh1](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/55) - 2018-12-08 - -#### Fixed -* [Set permissions during the restore script](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/55/commits/85be69b5ce15db0d9df0f0ca191be43c2ea6bc31) - -#### Changed -* [Update mypads to 1.6.8](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/55/commits/8c73fd242286029991b774d02ce9209c88793c21) diff --git a/check_process b/check_process deleted file mode 100644 index 4ba93a1..0000000 --- a/check_process +++ /dev/null @@ -1,75 +0,0 @@ -;; Test complet avec LibreOffice et MyPads - ; Manifest - domain="domain.tld" - path="/path" - is_public=1 - language="en" - admin="john" - password="1Strong-Password" - export="libreoffice" - mypads=1 - useldap=1 - ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - # 1.8.17~ynh1 - upgrade=1 from_commit=4d613658f120a05537f11f6814cc28e09d74a3c8 - backup_restore=1 - multi_instance=1 - change_url=1 -;; Test sans MyPads - ; Manifest - domain="domain.tld" - path="/path" - admin="john" - password="1Strong-Password" - language="en" - is_public=1 - export="libreoffice" - mypads=0 - useldap=0 - ; Checks - setup_sub_dir=1 - setup_root=1 - upgrade=1 - backup_restore=1 -;; Test Abiword - ; Manifest - domain="domain.tld" - path="/path" - admin="john" - password="1Strong-Password" - language="en" - is_public=1 - export="abiword" - mypads=1 - useldap=0 - ; Checks - setup_root=1 - # 1.8.17~ynh1 - upgrade=1 from_commit=4d613658f120a05537f11f6814cc28e09d74a3c8 -;; Test sans export - ; Manifest - domain="domain.tld" - path="/path" - admin="john" - password="1Strong-Password" - language="en" - is_public=1 - export="none" - mypads=1 - useldap=0 - ; Checks - setup_root=1 -;;; Options -Email= -Notification=change -;;; Upgrade options - ; commit=4d613658f120a05537f11f6814cc28e09d74a3c8 - name= #166 - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&password=password&language=en&is_public=1&abiword=0& diff --git a/doc/DISCLAIMER.md b/doc/ADMIN.md similarity index 100% rename from doc/DISCLAIMER.md rename to doc/ADMIN.md diff --git a/doc/DISCLAIMER_fr.md b/doc/ADMIN_fr.md similarity index 100% rename from doc/DISCLAIMER_fr.md rename to doc/ADMIN_fr.md diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md new file mode 100644 index 0000000..90c547e --- /dev/null +++ b/doc/POST_INSTALL.md @@ -0,0 +1 @@ +Informations="You can access two different admin panels, for Etherpad by accessing https://$domain${path%/}/admin and for MyPads (if installed) by accessing https://$domain${path%/}/mypads/?/admin." diff --git a/doc/screenshots/POST_INSTALL.md b/doc/screenshots/POST_INSTALL.md new file mode 100644 index 0000000..e69de29 diff --git a/manifest.json b/manifest.json deleted file mode 100644 index f6e8903..0000000 --- a/manifest.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "name": "Etherpad MyPads", - "id": "etherpad_mypads", - "packaging_format": 1, - "description": { - "en": "Online editor providing collaborative editing in real-time", - "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel" - }, - "version": "1.8.18~ynh2", - "url": "http://etherpad.org", - "upstream": { - "license": "Apache-2.0", - "website": "http://etherpad.org", - "demo": "https://video.etherpad.com", - "admindoc": "http://etherpad.org/doc/v1.8.18", - "code": "https://github.com/ether/etherpad-lite" - }, - "license": "Apache-2.0", - "maintainer": { - "name": "", - "email": "" - }, - "previous_maintainers": [ - { - "name": "Maniack Crudelis", - "email": "maniackc_dev@crudelis.fr" - } - ], - "requirements": { - "yunohost": ">= 4.3.0" - }, - "multi_instance": true, - "services": [ - "nginx", - "mysql" - ], - "arguments": { - "install": [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "path", - "type": "path", - "example": "/pad", - "default": "/pad" - }, - { - "name": "is_public", - "type": "boolean", - "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." - }, - "default": true - }, - { - "name": "language", - "type": "string", - "ask": { - "en": "Choose your language", - "fr": "Choisissez la langue" - }, - "choices": [ - "ca", - "de", - "en", - "es", - "fr", - "gl", - "hu", - "it", - "nl", - "pt" - ], - "default": "en" - }, - { - "name": "admin", - "type": "user" - }, - { - "name": "password", - "type": "password" - }, - { - "name": "export", - "type": "string", - "ask": { - "en": "Use AbiWord (~260 Mo) or LibreOffice (~400 Mo) (more stable) to expand export possibilities (PDF, doc)?", - "fr": "Utiliser AbiWord (~260 Mo) ou LibreOffice (~400 Mo) (plus stable) pour étendre les possibilités d'export (PDF, doc) ?" - }, - "choices": [ - "none", - "abiword", - "libreoffice" - ], - "default": "none" - }, - { - "name": "mypads", - "type": "boolean", - "ask": { - "en": "Do you want to install MyPads plugin?", - "fr": "Voulez-vous installer le plugin MyPads ?" - }, - "help": { - "en": "MyPads plugin" - }, - "default": true - }, - { - "name": "useldap", - "type": "boolean", - "ask": { - "en": "Do you want to use LDAP with MyPads?", - "fr": "Voulez-vous utiliser LDAP avec MyPads ?" - }, - "help": { - "en": "Using LDAP won't let you add new user aside from YunoHost users.", - "fr": "Utiliser LDAP ne vous permettra pas d'ajouter un nouvel utilisateur en dehors des utilisateurs de YunoHost." - }, - "default": true - } - ] - } -} diff --git a/scripts/install b/scripts/install index 49ccd9c..0001533 100644 --- a/scripts/install +++ b/scripts/install @@ -251,27 +251,6 @@ ynh_script_progression --message="Configuring Fail2Ban..." --weight=13 # Create a dedicated Fail2Ban config ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failregex=" .* .POST /mypads/api/auth/login HTTP/1.1. 400" --max_retry=5 -#================================================= -# SEND A README FOR THE ADMIN -#================================================= - -# Get main domain and buid the URL of the admin panel of the app. -admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4)/yunohost/admin/#/apps/$app" - -if [ $mypads -eq 1 ] -then - Informations="You can access two different admin panels, for Etherpad by accessing https://$domain${path%/}/admin and for MyPads by accessing https://$domain${path%/}/mypads/?/admin." -else - Informations="You can access the admin panel by accessing https://$domain${path%/}/admin." -fi - -echo "$Informations -You can also find a config file for Etherpad at this path /var/www/etherpad_mypads/settings.json. - -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" > mail_to_send - -ynh_send_readme_to_admin --app_message="mail_to_send" --recipients="$admin" --type=install - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index b109604..5bf2907 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -368,44 +368,6 @@ ynh_script_progression --message="Disabling maintenance mode..." --weight=5 ynh_maintenance_mode_OFF -#================================================= -# SEND A README FOR THE ADMIN -#================================================= - -# Get main domain and buid the URL of the admin panel of the app. -admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4)/yunohost/admin/#/apps/$app" - -# Build the changelog -# Get the value of admin_mail_html -#REMOVEME? admin_mail_html=$(ynh_app_setting_get $app admin_mail_html) -admin_mail_html="${admin_mail_html:-0}" -# If a html email is required. Apply html to the changelog. -if [ "$admin_mail_html" -eq 1 ]; then - format=html -else - format=plain -fi -ynh_app_changelog --format=$format - -if [ $mypads -eq 1 ] -then - Informations="You can access 2 different admin panels, for Etherpad by accessing https://$domain${path%/}/admin and for MyPads by accessing https://$domain${path%/}/mypads/?/admin." -else - Informations="You can access the admin panel by accessing https://$domain${path%/}/admin." -fi - -echo "$Informations -You can also find a config file for Etherpad at this path /var/www/etherpad_mypads/settings.json. - -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 - ---- - -Changelog since your last upgrade: -$(cat changelog)" > mail_to_send - -ynh_send_readme_to_admin --app_message="mail_to_send" --recipients="$admin" --type=upgrade - #================================================= # END OF SCRIPT #=================================================