From 0a05a5a6eeb4e75a12c8fe71f428d20819e287d6 Mon Sep 17 00:00:00 2001 From: "root@culturestrings" Date: Sat, 13 Jun 2020 22:01:11 +0000 Subject: /root/config/private/config/hostname ==> /root/config/private/config/hostinfo/*. --- public/fs/etc/openvpn/hostvpn-conf.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'public/fs/etc/openvpn/hostvpn-conf.sh') diff --git a/public/fs/etc/openvpn/hostvpn-conf.sh b/public/fs/etc/openvpn/hostvpn-conf.sh index 1abfb1f..cdfdb1c 100755 --- a/public/fs/etc/openvpn/hostvpn-conf.sh +++ b/public/fs/etc/openvpn/hostvpn-conf.sh @@ -2,9 +2,14 @@ set -eu +sitezone="$1" + +cfg_script="$0" +cfg_srcdir=$(cd -- "${cfg_script%/*}/" ; pwd -P) + source /root/config/private/config/server.ports -source /root/config/private/config/hostname +source /root/config/private/config/hostinfo/${sitezone} sed -e 's/@vpn_port@/'${vpn_port}'/g' \ -e 's/@hostname@/'${hostname}'/g' \ - "$1" + "${cfg_srcdir}/hostvpn.conf.in" -- cgit v1.2.3