Merge branch 'testing' into postgresql

2024-09-03 18:36:10 +02:00 · 2024-05-09 20:46:53 +02:00 · 2024-05-09 20:46:53 +02:00 · 8ad7213dc8
commit 8ad7213dc8
parent 4ca67adf81 a8595a93af
13 changed files with 52 additions and 41 deletions
--- a/README.md
+++ b/README.md
@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",


-**Shipped version:** 2.0.2~ynh1
+**Shipped version:** 2.0.3~ynh1

 **Demo:** <https://video.etherpad.com/>

@ -33,7 +33,7 @@ If you want to install Etherpad with plugins and mysql database: https://github.
 ## Documentation and resources

 - Official app website: <https://etherpad.org/>
- Official admin documentation: <http://etherpad.org/doc/v1.9.3>
+- Official admin documentation: <https://etherpad.org/doc/v2.0.2/>
 - Upstream app code repository: <https://github.com/ether/etherpad-lite>
 - YunoHost Store: <https://apps.yunohost.org/app/etherpad>
 - Report a bug: <https://github.com/YunoHost-Apps/etherpad_ynh/issues>
--- a/README_eu.md
+++ b/README_eu.md
@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",


-**Paketatutako bertsioa:** 2.0.2~ynh1
+**Paketatutako bertsioa:** 2.0.3~ynh1

 **Demoa:** <https://video.etherpad.com/>

@ -33,7 +33,7 @@ If you want to install Etherpad with plugins and mysql database: https://github.
 ## Dokumentazioa eta baliabideak

 - Aplikazioaren webgune ofiziala: <https://etherpad.org/>
- Administratzaileen dokumentazio ofiziala: <http://etherpad.org/doc/v1.9.3>
+- Administratzaileen dokumentazio ofiziala: <https://etherpad.org/doc/v2.0.2/>
 - Jatorrizko aplikazioaren kode-gordailua: <https://github.com/ether/etherpad-lite>
 - YunoHost Denda: <https://apps.yunohost.org/app/etherpad>
 - Eman errore baten berri: <https://github.com/YunoHost-Apps/etherpad_ynh/issues>
--- a/README_fr.md
+++ b/README_fr.md
@ -22,7 +22,7 @@ Attention, la sauvegarde et la restauration de la base de données Redis ne sont
 Si vous souhaitez installer Etherpad avec les plugins et la base de données mysql : https://github.com/YunoHost-Apps/etherpad_mypads_ynh",


-**Version incluse :** 2.0.2~ynh1
+**Version incluse :** 2.0.3~ynh1

 **Démo :** <https://video.etherpad.com/>

@ -33,7 +33,7 @@ Si vous souhaitez installer Etherpad avec les plugins et la base de données mys
 ## Documentations et ressources

 - Site officiel de l’app : <https://etherpad.org/>
- Documentation officielle de l’admin : <http://etherpad.org/doc/v1.9.3>
+- Documentation officielle de l’admin : <https://etherpad.org/doc/v2.0.2/>
 - Dépôt de code officiel de l’app : <https://github.com/ether/etherpad-lite>
 - YunoHost Store : <https://apps.yunohost.org/app/etherpad>
 - Signaler un bug : <https://github.com/YunoHost-Apps/etherpad_ynh/issues>
--- a/README_gl.md
+++ b/README_gl.md
@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",


-**Versión proporcionada:** 2.0.2~ynh1
+**Versión proporcionada:** 2.0.3~ynh1

 **Demo:** <https://video.etherpad.com/>

@ -33,7 +33,7 @@ If you want to install Etherpad with plugins and mysql database: https://github.
 ## Documentación e recursos

 - Web oficial da app: <https://etherpad.org/>
- Documentación oficial para admin: <http://etherpad.org/doc/v1.9.3>
+- Documentación oficial para admin: <https://etherpad.org/doc/v2.0.2/>
 - Repositorio de orixe do código: <https://github.com/ether/etherpad-lite>
 - Tenda YunoHost: <https://apps.yunohost.org/app/etherpad>
 - Informar dun problema: <https://github.com/YunoHost-Apps/etherpad_ynh/issues>
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -3,7 +3,7 @@
 请勿手动编辑。
 -->

-# YunoHost 的 Etherpad
+# YunoHost 上的 Etherpad

 [![集成程度](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![工作状态](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)

@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",


-**分发版本：** 2.0.2~ynh1
+**分发版本：** 2.0.3~ynh1

 **演示：** <https://video.etherpad.com/>

@ -33,7 +33,7 @@ If you want to install Etherpad with plugins and mysql database: https://github.
 ## 文档与资源

 - 官方应用网站： <https://etherpad.org/>
- 官方管理文档： <http://etherpad.org/doc/v1.9.3>
+- 官方管理文档： <https://etherpad.org/doc/v2.0.2/>
 - 上游应用代码库： <https://github.com/ether/etherpad-lite>
 - YunoHost 商店： <https://apps.yunohost.org/app/etherpad>
 - 报告 bug： <https://github.com/YunoHost-Apps/etherpad_ynh/issues>
--- a/conf/settings.json
+++ b/conf/settings.json
@ -292,14 +292,6 @@
   */
  "soffice": null,

-  /*
-   * Path to the Tidy executable.
-   *
-   * Tidy is used to improve the quality of exported pads.
-   * Setting it to null disables Tidy.
-   */
-  "tidyHtml": null,
-
  /*
   * Allow import of file types other than the supported ones:
   * txt, doc, docx, rtf, odt, html & htm
@ -504,7 +496,7 @@
  /*
   * Restrict socket.io transport methods
   */
-  "socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"],
+  "socketTransportProtocols" : ["websocket", "polling"],

  "socketIo": {
    /*
@ -627,5 +619,36 @@
  /*
   * Enable/Disable case-insensitive pad names.
   */
-  "lowerCasePadIds": false
+  "lowerCasePadIds": false,
+
+  "sso": {
+    "issuer": "${SSO_ISSUER:http://127.0.0.1:__PORT__}",
+      "clients": [
+        {
+          "client_id": "${ADMIN_CLIENT:admin_client}",
+          "client_secret": "${ADMIN_SECRET:admin}",
+          "grant_types": ["authorization_code"],
+          "response_types": ["code"],
+          "redirect_uris": ["${ADMIN_REDIRECT:http://127.0.0.1:__PORT__/admin/}"]
+        },
+        {
+          "client_id": "${USER_CLIENT:user_client}",
+          "client_secret": "${USER_SECRET:user}",
+          "grant_types": ["authorization_code"],
+          "response_types": ["code"],
+          "redirect_uris": ["${USER_REDIRECT:http://127.0.0.1:__PORT__/}"]
+        }
+      ]
+    }
+
+    /* Set the time to live for the tokens
+         This is the time of seconds a user is logged into Etherpad
+    "ttl":  {
+        "AccessToken": 3600,
+        "AuthorizationCode": 600,
+        "ClientCredentials": 3600,
+        "IdToken": 3600,
+        "RefreshToken": 86400
+    }
+    */
 }
--- a/conf/systemd.service
+++ b/conf/systemd.service
@ -11,6 +11,7 @@ Environment=ETHERPAD_PRODUCTION=true
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
 ExecStart=__INSTALL_DIR__/bin/run.sh
+#ExecStart=pnpm run prod
 Restart=always

 # Sandboxing options to harden security
--- a/manifest.toml
+++ b/manifest.toml
@ -2,10 +2,10 @@ packaging_format = 2

 id = "etherpad"
 name = "Etherpad"
-description.en = "Online editor providing collaborative editing in real-time"
-description.fr = "Éditeur en ligne fournissant l'édition collaborative en temps réel"
+description.en = "Collaborative editing in real-time"
+description.fr = "Édition collaborative en temps réel"

-version = "2.0.2~ynh1"
+version = "2.0.3~ynh1"

 maintainers = ["eric_G"]

@ -13,7 +13,7 @@ maintainers = ["eric_G"]
 license = "Apache-2.0"
 website = "https://etherpad.org/"
 demo = "https://video.etherpad.com/"
-admindoc = "http://etherpad.org/doc/v1.9.3"
+admindoc = "https://etherpad.org/doc/v2.0.2/"
 code = "https://github.com/ether/etherpad-lite"

 [integration]
@ -63,8 +63,8 @@ ram.runtime = "50M"

 [resources]
        [resources.sources.main]
-        url = "https://github.com/ether/etherpad-lite/archive/refs/tags/2.0.2.tar.gz"
-        sha256 = "5b5e47dbe7b07c3cafd8830780408f25141231b62f44ce9aa066329ed3223b4e"
+        url = "https://github.com/ether/etherpad-lite/archive/refs/tags/2.0.3.tar.gz"
+        sha256 = "6dc19addc8280806590f9a82d4426a88a8ef77c7841f99f97a50d6aa6c9ecc1a"
        autoupdate.strategy = "latest_github_tag"

    [resources.ports]
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================

-nodejs_version=20
+nodejs_version=22

 #=================================================
 # PERSONAL HELPERS
--- a/scripts/install
+++ b/scripts/install
@ -21,7 +21,6 @@ ynh_install_nodejs --nodejs_version=$nodejs_version
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=1

-# Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir=$install_dir

 chmod -R o-rwx "$install_dir"
@ -32,13 +31,10 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Configuring a systemd service..." --weight=4

-# Create a dedicated systemd config
 ynh_add_systemd_config

-# Create a dedicated NGINX config
 ynh_add_nginx_config

-# Use logrotate to manage application logfile(s)
 ynh_use_logrotate

 yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/$app.log"
@ -84,7 +80,6 @@ popd
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=6

-# Start a systemd service
 ynh_systemd_action --service_name=$app --action=restart --log_path=systemd --line_match="Your Etherpad version is"

 #=================================================
--- a/scripts/remove
+++ b/scripts/remove
@ -22,10 +22,8 @@ then
 	yunohost service remove $app
 fi

-# Remove the dedicated systemd config
 ynh_remove_systemd_config

-# Remove the app-specific logrotate config
 ynh_remove_logrotate

 ynh_remove_nodejs
@ -33,7 +31,6 @@ ynh_remove_nodejs
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config

-# Remove the log files
 ynh_secure_remove --file="/var/log/$app"

 #=================================================
--- a/scripts/restore
+++ b/scripts/restore
@ -16,7 +16,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=

 ynh_restore_file --origin_path="$install_dir"

-# Restore permissions on app files
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"

@ -31,7 +30,6 @@ chown $app:$app "$install_dir/credentials.json"
 #=================================================
 ynh_script_progression --message="Reinstalling dependencies..." --weight=7

-# Install Nodejs
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version

 pushd $install_dir
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -59,15 +59,12 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=3

-# Create a dedicated NGINX config
 ynh_add_nginx_config

 ynh_install_nodejs --nodejs_version=$nodejs_version

-# Create a dedicated systemd config
 ynh_add_systemd_config

-# Use logrotate to manage app-specific logfile(s)
 ynh_use_logrotate --non-append

 yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/$app.log"