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

Merge branch 'testing' into ci-auto-update-v1.8.18

This commit is contained in:
Éric Gaspar 2022-06-25 10:10:26 +02:00
commit d6df9305f7
No known key found for this signature in database
GPG key ID: 574F281483054D44
2 changed files with 8 additions and 8 deletions

View file

@ -33,7 +33,7 @@
setup_public=1
upgrade=1
# 1.8.17~ynh1
upgrade=1 from_commit=44f73d6d49c4ece92648f0374cf02ec4e9e3fb5f
upgrade=1 from_commit=4d613658f120a05537f11f6814cc28e09d74a3c8
backup_restore=1
multi_instance=1
port_already_use=0
@ -69,7 +69,7 @@
useldap=0
; Checks
setup_root=1
upgrade=1 from_commit=b7815983353a5409d473618f21107b4c621b9858
upgrade=1 from_commit=4d613658f120a05537f11f6814cc28e09d74a3c8
;; Test sans export
; Manifest
domain="domain.tld"
@ -87,6 +87,6 @@
Email=
Notification=change
;;; Upgrade options
; commit=b7815983353a5409d473618f21107b4c621b9858
name= #159
; commit=4d613658f120a05537f11f6814cc28e09d74a3c8
name= #166
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&password=password&language=en&is_public=1&abiword=0&

View file

@ -268,15 +268,15 @@ fi
#=================================================
# SETUP LOGROTATE
#=================================================
ynh_script_progression --message="Configuring log rotation..."
ynh_script_progression --message="Configuring log rotation..." --weight=1
# Use logrotate to manage application logfile(s)
ynh_use_logrotate
ynh_use_logrotate --non-append --specific_user=$app/$app
#=================================================
# INTEGRATE SERVICE IN YUNOHOST
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..."
ynh_script_progression --message="Integrating service in YunoHost..." --weight=2
yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/etherpad.log"
@ -324,7 +324,7 @@ ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin --aut
#=================================================
# RELOAD NGINX
#=================================================
ynh_script_progression --message="Reloading NGINX web server..."
ynh_script_progression --message="Reloading NGINX web server..." --weight=1
ynh_systemd_action --service_name=nginx --action=reload