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

Merge pull request #8 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Éric Gaspar 2021-02-27 22:29:29 +01:00 • committed by GitHub
commit 5b29a6c9c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -14,7 +14,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
## Overview
Etherpad allows you to edit documents collaboratively in real-time, much like a live multi-player editor that runs in your browser. Write articles, press releases, to-do lists, etc. together with your friends, fellow students or colleagues, all working on the same document at the same time.
**Shipped version:** 1.8.9
**Shipped version:** 1.8.11
## Screenshots
@ -32,7 +32,7 @@ You can access Etherpad's admin panel at `domain.tld/admin`. The configuration f
## Documentation
* Official documentation: http://etherpad.org/doc/v1.8.8
* Official documentation: http://etherpad.org/doc/v1.8.10
* YunoHost documentation: https://yunohost.org/#/app_etherpad
## YunoHost specific features

4
README_fr.md
View file

@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/inst
## Résumé
Etherpad vous permet d'éditer des documents de manière collaborative en temps réel, un peu comme un éditeur multi-joueurs en direct qui s'exécute dans votre navigateur. Rédigez des articles, des communiqués de presse, des listes de choses à faire, etc. avec vos amis, camarades ou collègues, tous travaillant sur le même document en même temps.
**Version embarquée :** 1.8.9
**Version embarquée :** 1.8.11
## Captures d'écran
@ -32,7 +32,7 @@ Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `domain
## Documentation
* Documentation officielle : http://etherpad.org/doc/v1.8.8
* Documentation officielle : http://etherpad.org/doc/v1.8.10
* Documentation YunoHost : https://yunohost.org/#/app_etherpad
## Fonctionnalités spécifiques à YunoHost

5
check_process
View file

@ -20,6 +20,7 @@
setup_private=1
setup_public=1
upgrade=1
upgrade=1 from_commit=96653aee9379d579a655777ac274355f4afca61c
backup_restore=1
multi_instance=1
port_already_use=0
@ -28,6 +29,6 @@
Email=
Notification=none
;;; Upgrade options
; commit=
name=
; commit=96653aee9379d579a655777ac274355f4afca61c
name=Merge pull request #6 from YunoHost-Apps/testing
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=9001&

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.9.tar.gz
SOURCE_SUM=8954af79cde7bc8b10b8d0fca6ed772228cf7bacb50af845b235d553bb24a919
SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.11.tar.gz
SOURCE_SUM=b9b9916d8e1b1ebe6dac5ebc0f24fa1ea064ddfd1307919bef2b58d7a8d5339c
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true

4
conf/settings.json
View file

@ -535,9 +535,7 @@
*/
"logconfig" :
{ "appenders": [
{ "type": "console"
//, "category": "access"// only logs pad access
}
{ "type": "console"}
/*
, { "type": "file"

4
manifest.json
View file

@ -6,14 +6,14 @@
"en": "Online editor providing collaborative editing in real-time.",
"fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel."
},
"version": "1.8.9~ynh1",
"version": "1.8.11~ynh1",
"url": "https://etherpad.org/",
"license": "Apache-2.0",
"maintainer": {
"name": "eric_G"
},
"requirements": {
"yunohost": ">= 4.1.3"
"yunohost": ">= 4.1.7"
},
"multi_instance": true,
"services": [

2
scripts/change_url
View file

@ -70,7 +70,7 @@ fi
#=================================================
ynh_script_progression --message="Stopping a systemd service..." --weight=2
ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
ynh_systemd_action --service_name=$app --action=stop --log_path=systemd
#=================================================
# MODIFY URL IN NGINX CONF

6
scripts/install
View file

@ -51,7 +51,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=2
ynh_app_setting_set --app=$app --key=domain --value=$domain
ynh_app_setting_set --app=$app --key=path --value=$path_url
ynh_app_setting_set --app=$app --key=admin --value=$admin
ynh_app_setting_set --app=$app --key=is_public --value=$is_public
ynh_app_setting_set --app=$app --key=language --value=$language
ynh_app_setting_set --app=$app --key=password --value=$password
@ -128,10 +127,9 @@ popd || ynh_die
ynh_script_progression --message="Configuring Etherpad..." --weight=60
ynh_add_config --template="../conf/settings.json" --destination="$final_path/settings.json"
ynh_add_config --template="../conf/credentials.json" --destination="$final_path/credentials.json"
# Calculate and store the config file checksum into the app settings
ynh_store_file_checksum --file="$final_path/settings.json"
ynh_add_config --template="../conf/credentials.json" --destination="$final_path/credentials.json"
ynh_store_file_checksum --file="$final_path/credentials.json"
#=================================================

6
scripts/upgrade
View file

@ -19,7 +19,6 @@ app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain)
path_url=$(ynh_app_setting_get --app=$app --key=path)
admin=$(ynh_app_setting_get --app=$app --key=admin)
is_public=$(ynh_app_setting_get --app=$app --key=is_public)
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
language=$(ynh_app_setting_get --app=$app --key=language)
port=$(ynh_app_setting_get --app=$app --key=port)
@ -127,8 +126,13 @@ ynh_system_user_create --username=$app
#=================================================
ynh_script_progression --message="Reconfiguring Etherpad..." --weight=6
ynh_backup_if_checksum_is_different --file="$final_path/settings.json"
ynh_add_config --template="../conf/settings.json" --destination="$final_path/settings.json"
ynh_store_file_checksum --file="$final_path/settings.json"
ynh_backup_if_checksum_is_different --file="$final_path/credentials.json"
ynh_add_config --template="../conf/credentials.json" --destination="$final_path/credentials.json"
ynh_store_file_checksum --file="$final_path/credentials.json"
#=================================================
# INSTALL ETHERPAD