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

Merge branch 'testing' into enh-testing

This commit is contained in:
ericgaspar 2020-12-08 17:24:43 +01:00
commit e344b0dee6
No known key found for this signature in database
GPG key ID: 574F281483054D44
4 changed files with 9 additions and 7 deletions

View file

@ -17,13 +17,8 @@
upgrade=1 from_commit=2d33783907d6de4486ac9e954ebc4b4028e11de8 upgrade=1 from_commit=2d33783907d6de4486ac9e954ebc4b4028e11de8
backup_restore=1 backup_restore=1
multi_instance=1 multi_instance=1
# This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version.
# incorrect_path=1
port_already_use=1 (8095) port_already_use=1 (8095)
change_url=1 change_url=1
;;; Levels
# If the level 5 (Package linter) is forced to 1. Please add justifications here.
Level 5=auto
;;; Upgrade options ;;; Upgrade options
; commit=2d33783907d6de4486ac9e954ebc4b4028e11de8 ; commit=2d33783907d6de4486ac9e954ebc4b4028e11de8
name=0.21-4~ynh4 name=0.21-4~ynh4

View file

@ -180,7 +180,7 @@ ynh_use_logrotate
#================================================= #=================================================
ynh_script_progression --message="Integrating service in YunoHost..." ynh_script_progression --message="Integrating service in YunoHost..."
yunohost service add $app --log "/var/log/$app.log" --log "/var/www/$app/log/production.log" yunohost service add $app --log="/var/log/$app.log" --log="/var/www/$app/log/production.log"
#================================================= #=================================================
# START SYSTEMD SERVICE # START SYSTEMD SERVICE

View file

@ -101,7 +101,7 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name"
ynh_script_progression --message="Restoring the systemd configuration..." ynh_script_progression --message="Restoring the systemd configuration..."
ynh_restore_file --origin_path="/etc/systemd/system/$app.service" ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
systemctl enable $app.service systemctl enable $app.service --quiet
#================================================= #=================================================
# INTEGRATE SERVICE IN YUNOHOST # INTEGRATE SERVICE IN YUNOHOST

View file

@ -227,6 +227,13 @@ ynh_script_progression --message="Integrating service in YunoHost..."
yunohost service add $app --log "/var/log/$app.log" --log "/var/www/$app/log/production.log" yunohost service add $app --log "/var/log/$app.log" --log "/var/www/$app/log/production.log"
#=================================================
# INTEGRATE SERVICE IN YUNOHOST
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..."
yunohost service add $app --log="/var/log/$app.log" --log="/var/www/$app/log/production.log"
#================================================= #=================================================
# SETUP SSOWAT # SETUP SSOWAT
#================================================= #=================================================