Merge branch 'testing' into postgresql

ALL_README.md

@@ -1,6 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
+- [Lea el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)

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.3~ynh1
+**Shipped version:** 2.1.0~ynh2
 
 **Demo:** <https://video.etherpad.com/>
 

README_es.md

@@ -0,0 +1,53 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Etherpad para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)
+
+[![Instalar Etherpad con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarEtherpad rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control.
+This version of Etherpad is installed without plugins and uses Redis as database.
+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 actual:** 2.1.0~ynh2
+
+**Demo:** <https://video.etherpad.com/>
+
+## Capturas
+
+![Captura de Etherpad](./doc/screenshots/screenshot.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://etherpad.org/>
+- Documentación administrador oficial: <https://etherpad.org/doc/v2.0.2/>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/ether/etherpad-lite>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/etherpad>
+- Reportar un error: <https://github.com/YunoHost-Apps/etherpad_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade etherpad -u https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

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.3~ynh1
+**Paketatutako bertsioa:** 2.1.0~ynh2
 
 **Demoa:** <https://video.etherpad.com/>
 

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.3~ynh1
+**Version incluse :** 2.1.0~ynh2
 
 **Démo :** <https://video.etherpad.com/>
 

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.3~ynh1
+**Versión proporcionada:** 2.1.0~ynh2
 
 **Demo:** <https://video.etherpad.com/>
 

README_zh_Hans.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",
 
 
-**分发版本：** 2.0.3~ynh1
+**分发版本：** 2.1.0~ynh2
 
 **演示：** <https://video.etherpad.com/>
 

conf/nginx.conf

@@ -7,11 +7,11 @@ location __PATH__/ {
 
     proxy_buffering off;
     more_set_headers "X-Frame-Options : ALLOWALL";
-    proxy_set_header X-Real-IP $remote_addr;       # http://wiki.nginx.org/HttpProxyModule
+    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $remote_addr; # EP logs to show the actual remote IP
+    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Proto $scheme;    # for EP to set secure cookie flag when https is used
+    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header Host $host;                   # pass the host header
+    proxy_set_header Host $host;
-    proxy_http_version 1.1;                        # recommended with keepalive connections
+    proxy_http_version 1.1;
   
     # WebSocket proxying - from http://nginx.org/en/docs/http/websocket.html
     proxy_set_header Upgrade $http_upgrade;

conf/systemd.service

@@ -7,11 +7,11 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
-Environment=ETHERPAD_PRODUCTION=true
+Environment="ETHERPAD_PRODUCTION=1"
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
 ExecStart=__INSTALL_DIR__/bin/run.sh
-#ExecStart=pnpm run prod
+#ExecStart=__NODEJS_PATH__/pnpm run prod
 Restart=always
 
 # Sandboxing options to harden security

doc/PRE_INSTALL.md

@@ -1 +1 @@
-Please note, this package is only intended to test Etherpad with redis database. It should not be used for production.
+Please note, this package is only intended to test Etherpad with Redis database. It should not be used for production.

manifest.toml

@@ -5,7 +5,7 @@ name = "Etherpad"
 description.en = "Collaborative editing in real-time"
 description.fr = "Édition collaborative en temps réel"
 
-version = "2.0.3~ynh1"
+version = "2.1.0~ynh2"
 
 maintainers = ["eric_G"]
 
@@ -17,7 +17,7 @@ admindoc = "https://etherpad.org/doc/v2.0.2/"
 code = "https://github.com/ether/etherpad-lite"
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.14"
 architectures = "all"
 multi_instance = true
 
@@ -63,8 +63,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/ether/etherpad-lite/archive/refs/tags/2.0.3.tar.gz"
+        url = "https://github.com/ether/etherpad-lite/archive/refs/tags/2.1.0.tar.gz"
-        sha256 = "6dc19addc8280806590f9a82d4426a88a8ef77c7841f99f97a50d6aa6c9ecc1a"
+        sha256 = "68a238852b82088a539228fb83eb4efa6599da163e6a3214e5cf15144a50ec49"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.ports]
@@ -81,11 +81,12 @@ ram.runtime = "50M"
     admin.show_tile = false
 
     [resources.apt]
+
     packages = "postgresql"
-    
+
     packages_from_raw_bash = """
           if [[ "$export" == "libreoffice" ]]
-          then 
+          then
               echo "unoconv libreoffice-writer"
           elif [[ "$export" == "abiword" ]]
           then
@@ -95,4 +96,4 @@ ram.runtime = "50M"
 
     [resources.database]
     type = "postgresql"
-    
+    

scripts/_common.sh

@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-nodejs_version=22
+nodejs_version=18
 
 #=================================================
 # PERSONAL HELPERS

scripts/backup

@@ -21,23 +21,13 @@ ynh_print_info --message="Declaring files to be backed up..."
 ynh_backup --src_path="$install_dir"
 
 #=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# SPECIFIC BACKUP
-#=================================================
-# BACKUP LOGROTATE
-#=================================================
-
 ynh_backup --src_path="/etc/logrotate.d/$app"
 
-#=================================================
-# BACKUP SYSTEMD
-#=================================================
-
 ynh_backup --src_path="/etc/systemd/system/$app.service"
 
 #=================================================

scripts/install

@@ -27,9 +27,9 @@ chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
 #=================================================
-# SETUP SYSTEMD
+# SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring a systemd service..." --weight=4
+ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
 
 ynh_add_systemd_config
 
@@ -40,9 +40,9 @@ ynh_use_logrotate
 yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/$app.log"
 
 #=================================================
-# MODIFY A CONFIG FILE
+# APP INITIAL CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring $app..." --weight=6
+ynh_script_progression --message="Adding $app's configuration files..." --weight=1
 
 abiword_path="null"
 soffice_path="null"
@@ -70,9 +70,9 @@ chown $app:$app "$install_dir/credentials.json"
 ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
- 	ynh_use_nodejs
+    ynh_use_nodejs
-    ynh_exec_warn_less npm install pnpm -g
+    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
- 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
+    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=1 COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm --recursive i --production
 popd
 
 #=================================================

scripts/restore

@@ -32,9 +32,9 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=7
 
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
-pushd $install_dir
+pushd "$install_dir"
- 	ynh_use_nodejs
+    ynh_use_nodejs
-    ynh_exec_warn_less npm install pnpm -g
+    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
 popd
 
 #=================================================
@@ -47,7 +47,7 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
 #=================================================
 # RESTORE SYSTEMD
 #=================================================
-ynh_script_progression --message="Restoring the systemd configuration..." --weight=8
+ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet

scripts/upgrade

@@ -97,12 +97,12 @@ chown $app:$app "$install_dir/credentials.json"
 #=================================================
 # INSTALL ETHERPAD
 #=================================================
-ynh_script_progression --message="Installing $app..." --weight=60
+ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
  	ynh_use_nodejs
- 	ynh_exec_warn_less npm install pnpm -g
+    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
- 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
+ 	ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
 popd
 
 #=================================================