mirror of
https://github.com/YunoHost-Apps/etherpad_ynh.git
synced 2024-09-03 18:36:10 +02:00
Merge branch 'testing' into test-nginx
This commit is contained in:
eric_G
GitHub
commit
5f53417f40
18 changed files with 45 additions and 39 deletions
|
|
@ -5,7 +5,7 @@ It shall NOT be edited by hand.
|
|||
|
||||
# Etherpad for YunoHost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/etherpad)  
|
||||
[](https://ci-apps.yunohost.org/ci/apps/etherpad/)  
|
||||
|
||||
[](https://install-app.yunohost.org/?app=etherpad)
|
||||
|
||||
|
|
@ -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.1.0~ynh1
|
||||
**Shipped version:** 2.1.0~ynh3
|
||||
|
||||
**Demo:** <https://video.etherpad.com/>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ No se debe editar a mano.
|
|||
|
||||
# Etherpad para Yunohost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/etherpad)  
|
||||
[](https://ci-apps.yunohost.org/ci/apps/etherpad/)  
|
||||
|
||||
[](https://install-app.yunohost.org/?app=etherpad)
|
||||
|
||||
|
|
@ -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 actual:** 2.1.0~ynh1
|
||||
**Versión actual:** 2.1.0~ynh3
|
||||
|
||||
**Demo:** <https://video.etherpad.com/>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ EZ editatu eskuz.
|
|||
|
||||
# Etherpad YunoHost-erako
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/etherpad)  
|
||||
[](https://ci-apps.yunohost.org/ci/apps/etherpad/)  
|
||||
|
||||
[](https://install-app.yunohost.org/?app=etherpad)
|
||||
|
||||
|
|
@ -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.1.0~ynh1
|
||||
**Paketatutako bertsioa:** 2.1.0~ynh3
|
||||
|
||||
**Demoa:** <https://video.etherpad.com/>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
|
|||
|
||||
# Etherpad pour YunoHost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/etherpad)  
|
||||
[](https://ci-apps.yunohost.org/ci/apps/etherpad/)  
|
||||
|
||||
[](https://install-app.yunohost.org/?app=etherpad)
|
||||
|
||||
|
|
@ -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.1.0~ynh1
|
||||
**Version incluse :** 2.1.0~ynh3
|
||||
|
||||
**Démo :** <https://video.etherpad.com/>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ NON debe editarse manualmente.
|
|||
|
||||
# Etherpad para YunoHost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/etherpad)  
|
||||
[](https://ci-apps.yunohost.org/ci/apps/etherpad/)  
|
||||
|
||||
[](https://install-app.yunohost.org/?app=etherpad)
|
||||
|
||||
|
|
@ -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.1.0~ynh1
|
||||
**Versión proporcionada:** 2.1.0~ynh3
|
||||
|
||||
**Demo:** <https://video.etherpad.com/>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
# YunoHost 上的 Etherpad
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/etherpad)  
|
||||
[](https://ci-apps.yunohost.org/ci/apps/etherpad/)  
|
||||
|
||||
[](https://install-app.yunohost.org/?app=etherpad)
|
||||
|
||||
|
|
@ -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.1.0~ynh1
|
||||
**分发版本：** 2.1.0~ynh3
|
||||
|
||||
**演示：** <https://video.etherpad.com/>
|
||||
|
||||
|
|
|
|||
|
|
@ -36,13 +36,22 @@ location __PATH__/admin {
|
|||
proxy_set_header Host $host;
|
||||
proxy_pass_header Server;
|
||||
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_http_version 1.1;
|
||||
proxy_buffering off;
|
||||
more_set_headers "X-Frame-Options : ALLOWALL";
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header Host $host;
|
||||
proxy_http_version 1.1;
|
||||
|
||||
# WebSocket proxying - from http://nginx.org/en/docs/http/websocket.html
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection $connection_upgrade;
|
||||
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection $connection_upgrade;
|
||||
client_max_body_size 50M;
|
||||
|
||||
# Include SSOWAT user panel.
|
||||
include conf.d/yunohost_panel.conf.inc;
|
||||
}
|
||||
|
||||
location __PATH__/admin-auth {
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@
|
|||
* This will improve the loading performance massively, but makes it difficult
|
||||
* to debug the javascript/css
|
||||
*/
|
||||
"minify": false,
|
||||
"minify": true,
|
||||
|
||||
/*
|
||||
* How long may clients use served javascript code (in seconds)?
|
||||
|
|
|
|||
|
|
@ -9,9 +9,7 @@ Group=__APP__
|
|||
WorkingDirectory=__INSTALL_DIR__/
|
||||
Environment="NODE_ENV=production"
|
||||
Environment="__YNH_NODE_LOAD_PATH__"
|
||||
Environment="ETHERPAD_PRODUCTION=true"
|
||||
ExecStart=__INSTALL_DIR__/bin/run.sh
|
||||
#ExecStart=pnpm run prod
|
||||
ExecStart=__NODEJS_PATH__/pnpm run prod
|
||||
Restart=always
|
||||
|
||||
# Sandboxing options to harden security
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
You can access Etherpad's admin panel at `__DOMAIN____PATH__/admin`. The configuration file for Etherpad is at the path `__INSTALL_DIR__/settings.json`.
|
||||
You can access Etherpad's admin panel at `__DOMAIN____PATH__admin`. The configuration file for Etherpad is at the path `__INSTALL_DIR__/settings.json`.
|
||||
|
||||
*Skin Builder* (accessible at this address `__DOMAIN____PATH__/pad/p/test#skinvariantsbuilder`) allows you to customize the skin of your pad. It will give you a parameter to copy into your configuration file `__INSTALL_DIR__/settings.json`.
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `__DOMAIN____PATH__/admin`. Le fichier de configuration d'Etherpad est `__INSTALL_DIR__/settings.json`.
|
||||
Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `__DOMAIN____PATH__admin`. Le fichier de configuration d'Etherpad est `__INSTALL_DIR__/settings.json`.
|
||||
|
||||
*Skin Builder* (accessible à l'adresse `__INSTALL_DIR__/pad/p/test#skinvariantsbuilder`) vous permet de personnaliser l'apparence de votre pad. Il vous donnera un paramètre à copier dans votre fichier de configuration `__INSTALL_DIR__/settings.json`.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
@ -5,7 +5,7 @@ name = "Etherpad"
|
|||
description.en = "Collaborative editing in real-time"
|
||||
description.fr = "Édition collaborative en temps réel"
|
||||
|
||||
version = "2.1.0~ynh1"
|
||||
version = "2.1.0~ynh3"
|
||||
|
||||
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.14"
|
||||
yunohost = ">= 11.2.20"
|
||||
architectures = "all"
|
||||
multi_instance = true
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# COMMON VARIABLES
|
||||
#=================================================
|
||||
|
||||
nodejs_version=22
|
||||
nodejs_version=20
|
||||
|
||||
#=================================================
|
||||
# PERSONAL HELPERS
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ ynh_script_progression --message="Installing dependencies..." --weight=6
|
|||
ynh_install_nodejs --nodejs_version=$nodejs_version
|
||||
|
||||
#=================================================
|
||||
# CREATE A POSTQRESQL DATABASE
|
||||
# CREATE REDIS DATABASE
|
||||
#=================================================
|
||||
ynh_script_progression --message="Creating a Redis database..." --weight=5
|
||||
|
||||
|
|
@ -36,9 +36,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
|
||||
|
||||
|
|
@ -49,9 +49,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"
|
||||
|
|
@ -81,7 +81,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
|
|||
pushd $install_dir
|
||||
ynh_use_nodejs
|
||||
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 env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true pnpm --recursive i --production
|
||||
ynh_exec_warn_less env $ynh_node_load_PATH pnpm --recursive i --production
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -32,8 +32,6 @@ ynh_redis_remove_db "$redis_db"
|
|||
|
||||
ynh_remove_nginx_config
|
||||
|
||||
ynh_secure_remove --file="/var/log/$app"
|
||||
|
||||
#=================================================
|
||||
# END OF SCRIPT
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ pushd "$install_dir"
|
|||
popd
|
||||
|
||||
#=================================================
|
||||
# RESTORE SYSTEMD
|
||||
# RESTORE SYSTEM CONFIGURATIONS
|
||||
#=================================================
|
||||
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
|
||||
|
|
|
|||
|
|
@ -102,7 +102,8 @@ ynh_script_progression --message="Installing $app..." --weight=10
|
|||
pushd $install_dir
|
||||
ynh_use_nodejs
|
||||
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 COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
|
||||
ynh_exec_warn_less env $ynh_node_load_PATH pnpm --recursive i --production
|
||||
ynh_secure_remove --file="$install_dir/var/minified*"
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue