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

Merge branch 'testing'

Browse source
This commit is contained in:
Josué Tille 2020-06-12 15:33:55 +02:00
commit 108dcdeb5b
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
5 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/experimental_helper.sh
View file

@ -17,7 +17,8 @@ ExecStart=/usr/bin/uwsgi \
--logto /var/log/uwsgi/%i/%i.log --logto /var/log/uwsgi/%i/%i.log
User=%i User=%i
Group=www-data Group=www-data
Restart=on-failure Restart=always
RestartSec=10
KillSignal=SIGQUIT KillSignal=SIGQUIT
Type=notify Type=notify
StandardError=syslog StandardError=syslog

8
scripts/install
View file

@ -129,14 +129,6 @@ ynh_script_progression --message="Protecting directory"
# Set permissions to app files # Set permissions to app files
set_permissions set_permissions
#=================================================
# INTEGRATE SERVICE IN YUNOHOST
#=================================================
ynh_print_info --message="Integrating service in YunoHost..."
yunohost service add "uwsgi-app@$app.service" --log "/var/log/uwsgi/app/$app"
#================================================= #=================================================
# SETUP SSOWAT # SETUP SSOWAT
#================================================= #=================================================

4
scripts/remove
View file

@ -29,10 +29,10 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
#================================================= #=================================================
# Remove the service from the list of services known by Yunohost (added from `yunohost service add`) # Remove the service from the list of services known by Yunohost (added from `yunohost service add`)
if ynh_exec_warn_less yunohost service status $app >/dev/null if ynh_exec_warn_less yunohost service status uwsgi-app@$app >/dev/null
then then
ynh_print_info --message="Removing $app service..." ynh_print_info --message="Removing $app service..."
yunohost service remove uwsgi-app@$app.service yunohost service remove uwsgi-app@$app
fi fi
#================================================= #=================================================

6
scripts/restore
View file

@ -81,12 +81,12 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./
# INTEGRATE SERVICE IN YUNOHOST # INTEGRATE SERVICE IN YUNOHOST
#================================================= #=================================================
yunohost service add "uwsgi-app@$app.service" --log "/var/log/uwsgi/app/$app" yunohost service add "uwsgi-app@$app" --log "/var/log/uwsgi/app/$app"
ynh_script_progression --message="Reloading services..." --weight=3 ynh_script_progression --message="Reloading services..." --weight=3
ynh_check_global_uwsgi_config ynh_check_global_uwsgi_config
systemctl enable "uwsgi-app@$app.service" systemctl enable "uwsgi-app@$app"
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION
@ -94,7 +94,7 @@ systemctl enable "uwsgi-app@$app.service"
# RELOAD NGINX AND UWSGI # RELOAD NGINX AND UWSGI
#================================================= #=================================================
systemctl start "uwsgi-app@$app.service" systemctl start "uwsgi-app@$app"
systemctl reload nginx systemctl reload nginx
ynh_script_progression --message="Restoration completed for $app" --last ynh_script_progression --message="Restoration completed for $app" --last

6
scripts/upgrade
View file

@ -68,6 +68,12 @@ if [ -e /etc/init.d/ffsync ]; then
yunohost service remove "$app" yunohost service remove "$app"
fi fi
# Remove old service ending with ".service"
if ynh_exec_warn_less yunohost service status "uwsgi-app@$app.service" >/dev/null
then
yunohost service remove uwsgi-app@$app.service
fi
#================================================= #=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#================================================= #=================================================