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

Merge branch 'testing'

This commit is contained in:
ericgaspar 2021-03-24 21:51:11 +01:00
commit df8c408a1c
No known key found for this signature in database
GPG key ID: 574F281483054D44
7 changed files with 6 additions and 12 deletions

View file

@ -33,7 +33,7 @@ You can access Etherpad's admin panel at `domain.tld/admin`. The configuration f
## Documentation
* Official documentation: http://etherpad.org/doc/v1.8.13
* YunoHost documentation: https://yunohost.org/#/app_etherpad
* YunoHost documentation: https://yunohost.org/en/app_etherpad
## YunoHost specific features

View file

@ -33,7 +33,7 @@ Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `domain
## Documentation
* Documentation officielle : http://etherpad.org/doc/v1.8.13
* Documentation YunoHost : https://yunohost.org/#/app_etherpad
* Documentation YunoHost : https://yunohost.org/fr/app_etherpad
## Fonctionnalités spécifiques à YunoHost

View file

@ -23,7 +23,6 @@
upgrade=1 from_commit=96653aee9379d579a655777ac274355f4afca61c
backup_restore=1
multi_instance=1
port_already_use=0
change_url=1
;;; Options
Email=

View file

@ -5,7 +5,7 @@
#=================================================
# dependencies used by the app
pkg_dependencies="postgresql postgresql-contrib apt-transport-https"
pkg_dependencies="postgresql postgresql-contrib"
nodejs_version=14

View file

@ -127,10 +127,7 @@ popd || ynh_die
ynh_script_progression --message="Configuring Etherpad..." --weight=60
ynh_add_config --template="../conf/settings.json" --destination="$final_path/settings.json"
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"
#=================================================
# GENERIC FINALIZATION
@ -140,6 +137,7 @@ ynh_store_file_checksum --file="$final_path/credentials.json"
# Set permissions to app files
chown -R $app: $final_path
chmod o-rwx $final_path
chmod 600 $final_path/credentials.json
#=================================================

View file

@ -92,6 +92,7 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
# Restore permissions on app files
chown -R $app: $final_path
chmod o-rwx $final_path
chmod 600 $final_path/credentials.json
#=================================================

View file

@ -126,13 +126,8 @@ ynh_install_nodejs --nodejs_version=$nodejs_version
#=================================================
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
@ -156,6 +151,7 @@ popd || ynh_die
# Set permissions on app files
chown -R $app: $final_path
chmod o-rwx $final_path
chmod 600 $final_path/credentials.json
#=================================================