No more service_name
This commit is contained in:
@@ -20,10 +20,6 @@ domain=$(ynh_app_setting_get $app domain)
|
||||
path_url=$(ynh_app_setting_get $app path)
|
||||
is_public=$(ynh_app_setting_get $app is_public)
|
||||
final_path=$(ynh_app_setting_get $app final_path)
|
||||
server_name=$(ynh_app_setting_get $app server_name)
|
||||
service_name=$(ynh_app_setting_get $app service_name)
|
||||
service_checker_name=$service_name"-checker"
|
||||
|
||||
|
||||
#=================================================
|
||||
# SPECIAL UPGRADE FOR VERSIONS < 1.2.0
|
||||
@@ -42,12 +38,6 @@ if [ -f /etc/php5/fpm/pool.d/vpnadmin.conf ]; then
|
||||
fi
|
||||
test -d /var/www/vpnadmin && mv /var/www/vpnadmin /var/www/${app}
|
||||
|
||||
if [ -z $service_name ]; then
|
||||
service_name="ynh-vpnclient"
|
||||
service_checker_name=$service_name"-checker"
|
||||
ynh_app_setting_set "$app" service_name "$service_name"
|
||||
fi
|
||||
|
||||
## Versions known to have a buggy backup script
|
||||
#buggy_versions="1.0.0 1.0.1 1.1.0"
|
||||
#curr_version=$(read_manifest version)
|
||||
@@ -101,19 +91,9 @@ systemctl reload nginx
|
||||
### Make sure that the yunohost services have a description and need-lock enabled
|
||||
|
||||
# main service
|
||||
|
||||
if service_is_managed_by_yunohost $service_name
|
||||
then
|
||||
yunohost service remove $service_name
|
||||
fi
|
||||
yunohost service add $service_name --description "Tunnels the internet traffic through a VPN" --need_lock
|
||||
|
||||
# checker service
|
||||
|
||||
if service_is_managed_by_yunohost $service_checker_name
|
||||
then
|
||||
yunohost service remove $service_checker_name
|
||||
fi
|
||||
yunohost service add $service_checker_name --description "Makes sure that the VPN service is running" --need_lock
|
||||
|
||||
# Reload systemd configuration
|
||||
|
Reference in New Issue
Block a user