Use ynh_systemd_action for backend helpers

This commit is contained in:
Maniack Crudelis 2019-01-28 16:26:43 +01:00 committed by GitHub
parent 2e1ccf2b99
commit 35ffadbe1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -117,10 +117,10 @@ ynh_remove_systemd_config () {
local finalsystemdconf="/etc/systemd/system/$service_name.service" local finalsystemdconf="/etc/systemd/system/$service_name.service"
if [ -e "$finalsystemdconf" ]; then if [ -e "$finalsystemdconf" ]; then
sudo systemctl stop $service_name ynh_systemd_action --service_name=$service_name --action=stop
sudo systemctl disable $service_name systemctl disable $service_name
ynh_secure_remove "$finalsystemdconf" ynh_secure_remove "$finalsystemdconf"
sudo systemctl daemon-reload systemctl daemon-reload
fi fi
} }
@ -186,7 +186,7 @@ ynh_add_nginx_config () {
ynh_store_file_checksum "$finalnginxconf" ynh_store_file_checksum "$finalnginxconf"
sudo systemctl reload nginx ynh_systemd_action --service_name=nginx --action=reload
} }
# Remove the dedicated nginx config # Remove the dedicated nginx config
@ -194,7 +194,7 @@ ynh_add_nginx_config () {
# usage: ynh_remove_nginx_config # usage: ynh_remove_nginx_config
ynh_remove_nginx_config () { ynh_remove_nginx_config () {
ynh_secure_remove "/etc/nginx/conf.d/$domain.d/$app.conf" ynh_secure_remove "/etc/nginx/conf.d/$domain.d/$app.conf"
sudo systemctl reload nginx ynh_systemd_action --service_name=nginx --action=reload
} }
# Create a dedicated php-fpm config # Create a dedicated php-fpm config
@ -229,7 +229,7 @@ ynh_add_fpm_config () {
sudo chown root: "$finalphpini" sudo chown root: "$finalphpini"
ynh_store_file_checksum "$finalphpini" ynh_store_file_checksum "$finalphpini"
fi fi
sudo systemctl reload $fpm_service ynh_systemd_action --service_name=$fpm_service --action=reload
} }
# Remove the dedicated php-fpm config # Remove the dedicated php-fpm config
@ -245,5 +245,5 @@ ynh_remove_fpm_config () {
fi fi
ynh_secure_remove "$fpm_config_dir/pool.d/$app.conf" ynh_secure_remove "$fpm_config_dir/pool.d/$app.conf"
ynh_secure_remove "$fpm_config_dir/conf.d/20-$app.ini" 2>&1 ynh_secure_remove "$fpm_config_dir/conf.d/20-$app.ini" 2>&1
sudo systemctl reload $fpm_service ynh_systemd_action --service_name=$fpm_service --action=reload
} }