Fix missing arg

This commit is contained in:
Kayou
2019-02-27 21:48:59 +01:00
parent 009efe81e8
commit 7e3813808b
3 changed files with 5 additions and 3 deletions

View File

@@ -121,7 +121,9 @@ function vpnclient_deploy_files_and_services()
{ {
local domain=$1 local domain=$1
local app=$2 local app=$2
local service_name=$3
local sysuser="${app}" local sysuser="${app}"
local service_checker_name="$service_name-checker"
# Ensure vpnclient_ynh has its own system user # Ensure vpnclient_ynh has its own system user
if ! ynh_system_user_exists ${sysuser} if ! ynh_system_user_exists ${sysuser}
@@ -138,7 +140,7 @@ function vpnclient_deploy_files_and_services()
install -o root -g root -m 0755 ../conf/ipv6_compressed /usr/local/bin/ install -o root -g root -m 0755 ../conf/ipv6_compressed /usr/local/bin/
# Install command-line cube file loader # Install command-line cube file loader
install -o root -g root -m 0755 ../conf/$service_checker-loadcubefile.sh /usr/local/bin/ install -o root -g root -m 0755 ../conf/$service_name-loadcubefile.sh /usr/local/bin/
# Copy confs # Copy confs
mkdir -pm 0755 /var/log/nginx/ mkdir -pm 0755 /var/log/nginx/

View File

@@ -80,7 +80,7 @@ ynh_install_app_dependencies "$pkg_dependencies"
#================================================= #=================================================
ynh_print_info "Deploy files from package..." ynh_print_info "Deploy files from package..."
vpnclient_deploy_files_and_services "${domain}" "${app}" vpnclient_deploy_files_and_services "${domain}" "${app}" "${service_name}"
#================================================= #=================================================
# RELOAD SERVICES # RELOAD SERVICES

View File

@@ -84,7 +84,7 @@ tmpdir=$(mktemp -d /tmp/vpnclient-upgrade-XXX)
cp -r /etc/openvpn/client* ${tmpdir} cp -r /etc/openvpn/client* ${tmpdir}
# Deploy files from package # Deploy files from package
vpnclient_deploy_files_and_services "${domain}" "${app}" vpnclient_deploy_files_and_services "${domain}" "${app}" "${service_name}"
# Restore previously existing config files # Restore previously existing config files
cp -r ${tmpdir}/client* /etc/openvpn/ cp -r ${tmpdir}/client* /etc/openvpn/