WEBLIB.RE/vpnclient_ynh
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Clean / simplify / reorganize a few things in install script

Browse Source
This commit is contained in:
Alexandre Aubin
2018-12-03 01:02:57 +01:00
committed by pitchum
parent 34d8b55b44
commit fc1d305b2b
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/install
View File

@@ -39,23 +39,17 @@ ynh_abort_if_errors
# Retrieve arguments # Retrieve arguments
domain=$1 domain=$1
path_url=$2 path_url=$(ynh_normalize_url_path "$2")
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
final_path="/var/www/$app"
#================================================= #=================================================
# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
#================================================= #=================================================
# Check destination directory # Check destination directory
final_path="/var/www/$app"
test ! -e "$final_path" || ynh_die "Path is already in use: ${final_path}." test ! -e "$final_path" || ynh_die "Path is already in use: ${final_path}."
# Normalize the url path syntax
path_url=$(ynh_normalize_url_path "$path_url")
# Check web path availability
ynh_webpath_available "$domain" "$path_url"
# Register (book) web path # Register (book) web path
ynh_webpath_register "$app" "$domain" "$path_url" ynh_webpath_register "$app" "$domain" "$path_url"
@@ -80,8 +74,6 @@ ynh_install_app_dependencies "$pkg_dependencies"
vpnclient_deploy_files_and_services "${domain}" "${app}" vpnclient_deploy_files_and_services "${domain}" "${app}"
ynh_app_setting_set $app final_path $final_path
# Set default inits # Set default inits
# The boot order of these services are important, so they are disabled by default # The boot order of these services are important, so they are disabled by default
@@ -102,5 +94,4 @@ sudo systemctl enable ynh-vpnclient-checker.service
ynh_systemctl start ynh-vpnclient-checker.timer ynh_systemctl start ynh-vpnclient-checker.timer
sudo systemctl enable ynh-vpnclient-checker.timer sudo systemctl enable ynh-vpnclient-checker.timer
sudo yunohost app ssowatconf sudo yunohost app ssowatconf