diff --git a/scripts/install b/scripts/install index 0a534ab..6ec071b 100755 --- a/scripts/install +++ b/scripts/install @@ -18,7 +18,7 @@ ynh_script_progression --message="Configuring logrotate to manage application lo # Use logrotate to manage application logfile(s) ynh_use_logrotate --specific_user=$app touch /var/log/$app/$app.log -touch /var/log/$app/$app_workers.log +touch /var/log/$app/${app}_workers.log chown -R $app:www-data /var/log/$app/ @@ -92,7 +92,7 @@ ynh_add_systemd_config --service="${app}_workers" --template="fittrackee_workers ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" -yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/$app_workers.log" +yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/${app}_workers.log" #================================================= @@ -108,7 +108,7 @@ ynh_script_progression --message="Starting the systemd services..." --weight=15 # Start a systemd service ynh_systemd_action --service_name="${app}" --action="start" --log_path="/var/log/$app/$app.log" --line_match="Booting worker with pid" -ynh_systemd_action --service_name="${app}_workers" --action="start" --log_path="/var/log/$app/$app_workers.log" --line_match="Started" +ynh_systemd_action --service_name="${app}_workers" --action="start" --log_path="/var/log/$app/${app}_workers.log" --line_match="Started" #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index a9940cf..930c4c6 100644 --- a/scripts/restore +++ b/scripts/restore @@ -22,7 +22,7 @@ ynh_script_progression --message="Configuring logrotate to manage application lo # Use logrotate to manage application logfile(s) ynh_use_logrotate --specific_user=$app touch /var/log/$app/$app.log -touch /var/log/$app/$app_workers.log +touch /var/log/$app/${app}_workers.log chown -R $app:www-data /var/log/$app/ #================================================= @@ -67,7 +67,7 @@ systemctl enable "${app}_workers.service" --quiet ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" -yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/$app_workers.log" +yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/${app}_workers.log" #================================================= # START SYSTEMD SERVICE @@ -75,7 +75,7 @@ yunohost service add "${app}_workers" --description="Fittrackee task queue servi ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name="${app}" --action="start" --log_path="/var/log/$app/$app.log" --line_match="Booting worker with pid" -ynh_systemd_action --service_name="${app}_workers" --action="start" --log_path="/var/log/$app/$app_workers.log" --line_match="Started" +ynh_systemd_action --service_name="${app}_workers" --action="start" --log_path="/var/log/$app/${app}_workers.log" --line_match="Started" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 36b43fe..2d07913 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -29,7 +29,7 @@ upgrade_type=$(ynh_check_app_version_changed) ynh_script_progression --message="Stopping a systemd service..." --weight=1 ynh_systemd_action --action="stop" --service_name="${app}" --log_path="/var/log/$app/$app.log" --line_match="Stopped" -ynh_systemd_action --action="stop" --service_name="${app}_workers" --log_path="/var/log/$app/$app_workers.log" --line_match="Stopped" +ynh_systemd_action --action="stop" --service_name="${app}_workers" --log_path="/var/log/$app/${app}_workers.log" --line_match="Stopped" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -90,7 +90,7 @@ ynh_add_systemd_config --service="${app}_workers" --template="fittrackee_workers ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" -yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/$app_workers.log" +yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/${app}_workers.log" #================================================= # START SYSTEMD SERVICE @@ -99,7 +99,7 @@ ynh_script_progression --message="Starting the systemd services..." --weight=15 # Start a systemd service ynh_systemd_action --service_name="${app}" --action="start" --log_path="/var/log/$app/$app.log" --line_match="Booting worker with pid" -ynh_systemd_action --service_name="${app}_workers" --action="start" --log_path="/var/log/$app/$app_workers.log" --line_match="Started" +ynh_systemd_action --service_name="${app}_workers" --action="start" --log_path="/var/log/$app/${app}_workers.log" --line_match="Started" #================================================= # END OF SCRIPT