YunoHost-Apps/etherpad_mypads_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/etherpad_mypads_ynh.git synced 2024-09-03 18:36:09 +02:00
Code Issues Activity Actions

Merge pull request #154 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Éric Gaspar 2021-11-22 15:10:16 +01:00 • committed by GitHub
commit a272d41956
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 62 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -1,6 +1,13 @@
Changelog Changelog
========= =========
## [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 ## [1.8.14~ynh2]() - 2021-10-01

7
README.md
View file

@ -15,9 +15,10 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
## Overview ## Overview
Online editor providing collaborative editing in real-time 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.
**Shipped version:** 1.8.14~ynh2
**Shipped version:** 1.8.15~ynh1
**Demo:** https://video.etherpad.com **Demo:** https://video.etherpad.com
@ -62,7 +63,7 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether
## Documentation and resources ## Documentation and resources
* Official app website: http://etherpad.org * Official app website: http://etherpad.org
* Official admin documentation: http://etherpad.org/doc/v1.8.14 * Official admin documentation: http://etherpad.org/doc/v1.8.15
* Upstream app code repository: https://github.com/ether/etherpad-lite * Upstream app code repository: https://github.com/ether/etherpad-lite
* YunoHost documentation for this app: https://yunohost.org/app_etherpad_mypads * YunoHost documentation for this app: https://yunohost.org/app_etherpad_mypads
* Report a bug: https://github.com/YunoHost-Apps/etherpad_mypads_ynh/issues * Report a bug: https://github.com/YunoHost-Apps/etherpad_mypads_ynh/issues

7
README_fr.md
View file

@ -11,9 +11,10 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
## Vue d'ensemble ## Vue d'ensemble
Éditeur en ligne fournissant l'édition collaborative en temps réel Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers d'utilisateurs simultanés en temps réel. Il fournit des capacités complètes d'exportation de données et s'exécute sur votre serveur, sous votre contrôle.
**Version incluse :** 1.8.14~ynh2
**Version incluse :** 1.8.15~ynh1
**Démo :** https://video.etherpad.com **Démo :** https://video.etherpad.com
@ -59,7 +60,7 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : http://etherpad.org * Site officiel de l'app : http://etherpad.org
* Documentation officielle de l'admin : http://etherpad.org/doc/v1.8.14 * Documentation officielle de l'admin : http://etherpad.org/doc/v1.8.15
* Dépôt de code officiel de l'app : https://github.com/ether/etherpad-lite * Dépôt de code officiel de l'app : https://github.com/ether/etherpad-lite
* Documentation YunoHost pour cette app : https://yunohost.org/app_etherpad_mypads * Documentation YunoHost pour cette app : https://yunohost.org/app_etherpad_mypads
* Signaler un bug : https://github.com/YunoHost-Apps/etherpad_mypads_ynh/issues * Signaler un bug : https://github.com/YunoHost-Apps/etherpad_mypads_ynh/issues

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.14.tar.gz SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.15.tar.gz
SOURCE_SUM=5404035675fb5ee9349d42927895bb3933590823612ebe31ca4cc523afdac49e SOURCE_SUM=3f4a4e1061f3fe6e6c6c5024ffc98045968c3801c9d630895ad78f5106a42e78
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
ARCH_FORMAT=tar.gz ARCH_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

23
conf/nginx.conf
View file

@ -1,21 +1,22 @@
#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
location __PATH__/ { location __PATH__/ {
# Force usage of https
if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
#sub_path_only rewrite ^__PATH__/admin$ __PATH__/admin/ permanent;
proxy_pass http://127.0.0.1:__PORT__/; proxy_pass http://127.0.0.1:__PORT__/;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_pass_header Server;
# be careful, this line doesn't override any proxy_buffering on set in a conf.d/file.conf
proxy_buffering off; proxy_buffering off;
more_set_headers "X-Frame-Options : ALLOWALL"; more_set_headers "X-Frame-Options : ALLOWALL";
proxy_set_header X-Real-IP $remote_addr; # http://wiki.nginx.org/HttpProxyModule
proxy_set_header X-Forwarded-For $remote_addr; # EP logs to show the actual remote IP
proxy_set_header X-Forwarded-Proto $scheme; # for EP to set secure cookie flag when https is used
proxy_set_header Host $host; # pass the host header
proxy_http_version 1.1; # recommended with keepalive connections
# Recommended proxy_http version for keepalive connections # WebSocket proxying - from http://nginx.org/en/docs/http/websocket.html
# https://github.com/ether/etherpad-lite/wiki/How-to-put-Etherpad-Lite-behind-a-reverse-Proxy#nginx proxy_set_header Upgrade $http_upgrade;
proxy_http_version 1.1; proxy_set_header Connection $connection_upgrade;
# Include SSOWAT user panel. # Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc; include conf.d/yunohost_panel.conf.inc;

52
conf/settings.json
View file

@ -549,58 +549,6 @@
*/ */
"loglevel": "INFO", "loglevel": "INFO",
/*
* Logging configuration. See log4js documentation for further information:
* https://github.com/nomiddlename/log4js-node
*
* You can add as many appenders as you want here.
*/
"logconfig" :
{ "appenders": [
{ "type": "console"
//, "category": "access"// only logs pad access
}
/*
, { "type": "file"
, "filename": "your-log-file-here.log"
, "maxLogSize": 1024
, "backups": 3 // how many log files there're gonna be at max
//, "category": "test" // only log a specific category
}
*/
/*
, { "type": "logLevelFilter"
, "level": "warn" // filters out all log messages that have a lower level than "error"
, "appender":
{ Use whatever appender you want here }
}
*/
/*
, { "type": "logLevelFilter"
, "level": "error" // filters out all log messages that have a lower level than "error"
, "appender":
{ "type": "smtp"
, "subject": "An error occurred in your EPL instance!"
, "recipients": "bar@blurdybloop.com, baz@blurdybloop.com"
, "sendInterval": 300 // 60 * 5 = 5 minutes -- will buffer log messages; set to 0 to send a mail for every message
, "transport": "SMTP", "SMTP": { // see https://github.com/andris9/Nodemailer#possible-transport-methods
"host": "smtp.example.com", "port": 465,
"secureConnection": true,
"auth": {
"user": "foo@example.com",
"pass": "bar_foo"
}
}
}
}
*/
]
}, // logconfig
/* Override any strings found in locale directories */ /* Override any strings found in locale directories */
"customLocaleStrings": {}, "customLocaleStrings": {},

2
config_panel.toml
View file

@ -1,4 +1,4 @@
version = "0.1" version = "1.0"
name = "Etherpad configuration panel" name = "Etherpad configuration panel"
[main] [main]

1
doc/DESCRIPTION.md Normal file
View file

@ -0,0 +1 @@
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.

1
doc/DESCRIPTION_fr.md Normal file
View file

@ -0,0 +1 @@
Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers d'utilisateurs simultanés en temps réel. Il fournit des capacités complètes d'exportation de données et s'exécute sur votre serveur, sous votre contrôle.

8
manifest.json
View file

@ -6,13 +6,13 @@
"en": "Online editor providing collaborative editing in real-time", "en": "Online editor providing collaborative editing in real-time",
"fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel" "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel"
}, },
"version": "1.8.14~ynh2", "version": "1.8.15~ynh1",
"url": "http://etherpad.org", "url": "http://etherpad.org",
"upstream": { "upstream": {
"license": "Apache-2.0", "license": "Apache-2.0",
"website": "http://etherpad.org", "website": "http://etherpad.org",
"demo": "https://video.etherpad.com", "demo": "https://video.etherpad.com",
"admindoc": "http://etherpad.org/doc/v1.8.14", "admindoc": "http://etherpad.org/doc/v1.8.15",
"code": "https://github.com/ether/etherpad-lite" "code": "https://github.com/ether/etherpad-lite"
}, },
"license": "Apache-2.0", "license": "Apache-2.0",
@ -25,7 +25,7 @@
"email": "maniackc_dev@crudelis.fr" "email": "maniackc_dev@crudelis.fr"
}], }],
"requirements": { "requirements": {
"yunohost": ">= 4.2.4" "yunohost": ">= 4.3.0"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
@ -59,7 +59,7 @@
"en": "Choose your language", "en": "Choose your language",
"fr": "Choisissez la langue" "fr": "Choisissez la langue"
}, },
"choices" : ["de", "en", "es", "fr", "it"], "choices" : ["ca", "de", "en", "es", "fr", "gl", "hu", "it", "nl", "pt"],
"default" : "en" "default" : "en"
}, },
{ {

22
scripts/_common.sh
View file

@ -15,22 +15,22 @@ nodejs_version=14
# MyPads version # MyPads version
# This variable is mostly used to force an upgrade of the package in case of new versions of MyPads. # This variable is mostly used to force an upgrade of the package in case of new versions of MyPads.
mypads_version=1.7.21 mypads_version=1.7.22
# Plugin versions # Plugin versions
ep_align_version=0.3.34 ep_align_version=0.3.42
ep_author_hover_version=0.3.21 ep_author_hover_version=0.3.28
ep_comments_page_version=0.1.63 ep_comments_page_version=0.1.79
ep_countable_version=0.0.11 ep_countable_version=0.0.11
ep_delete_empty_pads_version=0.0.7 ep_delete_empty_pads_version=0.0.7
ep_font_color_version=0.0.45 ep_font_color_version=0.0.52
ep_headings2_version=0.2.30 ep_headings2_version=0.2.35
ep_markdown_version=0.1.36 ep_markdown_version=0.1.41
ep_page_view_version=0.5.24 ep_page_view_version=0.5.24
ep_spellcheck_version=0.0.28 ep_spellcheck_version=0.0.34
ep_subscript_and_superscript_version=0.2.30 ep_subscript_and_superscript_version=0.2.37
ep_table_of_contents_version=0.3.22 ep_table_of_contents_version=0.3.29
ep_font_size_version=0.4.25 ep_font_size_version=0.4.31
#================================================= #=================================================
# PERSONAL HELPERS # PERSONAL HELPERS

2
scripts/remove
View file

@ -31,7 +31,7 @@ export=$(ynh_app_setting_get --app=$app --key=export)
# Remove the service from the list of services known, YunoHost (added from `yunohost service add`) # Remove the service from the list of services known, YunoHost (added from `yunohost service add`)
if ynh_exec_warn_less yunohost service status $app >/dev/null if ynh_exec_warn_less yunohost service status $app >/dev/null
then then
ynh_script_progression --message="Removing $app service integration..." ynh_script_progression --message="Removing $app service integration..." --weight=2
yunohost service remove $app yunohost service remove $app
fi fi

4
scripts/restore
View file

@ -63,14 +63,14 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================
# RESTORE THE APP MAIN DIR # RESTORE THE APP MAIN DIR
#================================================= #=================================================
ynh_script_progression --message="Restoring the app main directory..." ynh_script_progression --message="Restoring the app main directory..." --weight=2
ynh_restore_file --origin_path="$final_path" ynh_restore_file --origin_path="$final_path"
#================================================= #=================================================
# RESTORE THE MYSQL DATABASE # RESTORE THE MYSQL DATABASE
#================================================= #=================================================
ynh_script_progression --message="Restoring the MySQL database..." ynh_script_progression --message="Restoring the MySQL database..." --weight=2
db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd

6
scripts/upgrade
View file

@ -222,7 +222,7 @@ fi
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
# Overwrite the NGINX configuration only if it's allowed # Overwrite the NGINX configuration only if it's allowed
if [ $overwrite_nginx -eq 1 ] if [ $overwrite_nginx -eq 1 ]
@ -240,7 +240,7 @@ ynh_install_nodejs --nodejs_version=$nodejs_version
#================================================= #=================================================
# HANDLE LOG FILES AND LOGROTATE # HANDLE LOG FILES AND LOGROTATE
#================================================= #=================================================
ynh_script_progression --message="Configuring log rotation..." ynh_script_progression --message="Configuring log rotation..." --weight=1
# Create log directory # Create log directory
install_log=/var/log/$app/installation.log install_log=/var/log/$app/installation.log
@ -424,7 +424,7 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failrege
#================================================= #=================================================
# SETUP LOGROTATE # SETUP LOGROTATE
#================================================= #=================================================
ynh_script_progression --message="Upgrading logrotate configuration..." ynh_script_progression --message="Upgrading logrotate configuration..." --weight=2
# Use logrotate to manage app-specific logfile(s) # Use logrotate to manage app-specific logfile(s)
ynh_use_logrotate --non-append --specific_user=$app/$app ynh_use_logrotate --non-append --specific_user=$app/$app