mirror of
https://github.com/YunoHost-Apps/etherpad_ynh.git
synced 2024-09-03 18:36:10 +02:00
Merge branch 'testing' into redis
This commit is contained in:
ericgaspar
commit
89c3e272ea
9 changed files with 32 additions and 20 deletions
|
|
@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
|
|||
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.15~ynh1
|
||||
**Shipped version:** 1.8.16~ynh1
|
||||
|
||||
**Demo:** https://video.etherpad.com/
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ You can access Etherpad's admin panel at `domain.tld/admin`. The configuration f
|
|||
## Documentation and resources
|
||||
|
||||
* Official app website: https://etherpad.org/
|
||||
* Official admin documentation: http://etherpad.org/doc/v1.8.14
|
||||
* Official admin documentation: http://etherpad.org/doc/v1.8.16
|
||||
* Upstream app code repository: https://github.com/ether/etherpad-lite
|
||||
* YunoHost documentation for this app: https://yunohost.org/app_etherpad
|
||||
* Report a bug: https://github.com/YunoHost-Apps/etherpad_ynh/issues
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
|
|||
|
||||
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.15~ynh1
|
||||
**Version incluse :** 1.8.16~ynh1
|
||||
|
||||
**Démo :** https://video.etherpad.com/
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `domain
|
|||
## Documentations et ressources
|
||||
|
||||
* Site officiel de l'app : https://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.16
|
||||
* 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
|
||||
* Signaler un bug : https://github.com/YunoHost-Apps/etherpad_ynh/issues
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.15.tar.gz
|
||||
SOURCE_SUM=3f4a4e1061f3fe6e6c6c5024ffc98045968c3801c9d630895ad78f5106a42e78
|
||||
SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.16.tar.gz
|
||||
SOURCE_SUM=dfdb60910aa9df85bde8cad8729ef6a33e36014739a3e8ce105f5e96a6b99d8c
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FORMAT=tar.gz
|
||||
SOURCE_IN_SUBDIR=true
|
||||
|
|
|
|||
|
|
@ -20,12 +20,14 @@
|
|||
* https://www.npmjs.com/package/ueberdb2
|
||||
*/
|
||||
|
||||
/* An Example of Redis Configuration */
|
||||
"dbType" : "redis",
|
||||
/* An Example of MySQL Configuration */
|
||||
"dbType" : "postgres",
|
||||
"dbSettings" : {
|
||||
"user" : "__DB_NAME__",
|
||||
"host" : "localhost",
|
||||
"port" : 6379,
|
||||
"database": "__REDIS_DB__"
|
||||
"port" : 5432,
|
||||
"password": "__DB_PWD__",
|
||||
"database": "__DB_NAME__"
|
||||
},
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
[Unit]
|
||||
Description=Etherpad-lite, collaborative editing of documents in real-time.
|
||||
Description=Etherpad-lite, the collaborative editor.
|
||||
After=syslog.target network.target postgresql.service
|
||||
|
||||
[Service]
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
"en": "Online editor providing collaborative editing in real-time",
|
||||
"fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel"
|
||||
},
|
||||
"version": "1.8.15~ynh1",
|
||||
"version": "1.8.16~ynh1",
|
||||
"url": "https://etherpad.org/",
|
||||
"upstream": {
|
||||
"license": "Apache-2.0",
|
||||
"website": "https://etherpad.org/",
|
||||
"demo": "https://video.etherpad.com/",
|
||||
"admindoc": "http://etherpad.org/doc/v1.8.14",
|
||||
"admindoc": "http://etherpad.org/doc/v1.8.16",
|
||||
"code": "https://github.com/ether/etherpad-lite"
|
||||
},
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ chown -R $app $final_path
|
|||
|
||||
pushd $final_path
|
||||
ynh_use_nodejs
|
||||
ynh_exec_as $app env $ynh_node_load_PATH src/bin/installDeps.sh
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH src/bin/installDeps.sh
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -35,8 +35,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
|||
#=================================================
|
||||
ynh_script_progression --message="Validating restoration parameters..." --weight=2
|
||||
|
||||
test ! -d $final_path \
|
||||
|| ynh_die --message="There is already a directory: $final_path "
|
||||
test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
|
||||
|
||||
#=================================================
|
||||
# STANDARD RESTORATION STEPS
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
|
|||
if [ "$upgrade_type" == "UPGRADE_APP" ]
|
||||
then
|
||||
ynh_script_progression --message="Upgrading source files..." --weight=1
|
||||
|
||||
#ynh_secure_remove --file="$final_path"
|
||||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
ynh_setup_source --dest_dir="$final_path" --keep="$final_path/settings.json $final_path/credentials.json"
|
||||
fi
|
||||
|
|
@ -108,6 +108,17 @@ chmod 750 "$final_path"
|
|||
chmod -R o-rwx "$final_path"
|
||||
chown -R $app:www-data "$final_path"
|
||||
|
||||
#=================================================
|
||||
# UPGRADE DEPENDENCIES
|
||||
#=================================================
|
||||
ynh_script_progression --message="Upgrading dependencies..." --weight=5
|
||||
|
||||
if [ "$export" = "abiword" ]; then
|
||||
ynh_exec_warn_less ynh_install_app_dependencies $abiword_app_depencencies
|
||||
elif [ "$export" = "libreoffice" ]; then
|
||||
ynh_exec_warn_less ynh_install_app_dependencies $libreoffice_app_dependencies
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
# NGINX CONFIGURATION
|
||||
#=================================================
|
||||
|
|
@ -130,9 +141,9 @@ ynh_script_progression --message="Installing Etherpad..." --weight=90
|
|||
|
||||
pushd $final_path
|
||||
ynh_use_nodejs
|
||||
ynh_exec_as $app env "$ynh_node_load_PATH" src/bin/installDeps.sh
|
||||
ynh_exec_warn_less ynh_exec_as $app env "$ynh_node_load_PATH" npm cache clean --force
|
||||
ynh_exec_warn_less ynh_exec_as $app env "$ynh_node_load_PATH" npm install --upgrade
|
||||
ynh_exec_warn_less ynh_exec_as $app env "$ynh_node_load_PATH" src/bin/installDeps.sh
|
||||
#ynh_exec_warn_less ynh_exec_as $app env "$ynh_node_load_PATH" npm cache clean --force
|
||||
#ynh_exec_warn_less ynh_exec_as $app env "$ynh_node_load_PATH" npm install --upgrade
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue