|
@@ -458,8 +458,9 @@ function remove_user_vpn {
|
458
|
458
|
function mesh_setup_vpn {
|
459
|
459
|
vpn_generate_keys
|
460
|
460
|
|
461
|
|
- if [ ${VPN_TLS_PORT} -ne 443 ]; then
|
462
|
|
- firewall_add VPN-TLS ${VPN_TLS_PORT} tcp
|
|
461
|
+ if [ -d /home/fbone ]; then
|
|
462
|
+ cp /etc/stunnel/stunnel-client.conf /home/fbone/stunnel-client.conf
|
|
463
|
+ chown fbone:fbone /home/fbone/stunnel*
|
463
|
464
|
fi
|
464
|
465
|
|
465
|
466
|
generate_stunnel_keys
|
|
@@ -501,7 +502,6 @@ function generate_stunnel_keys {
|
501
|
502
|
function install_stunnel {
|
502
|
503
|
prefix=
|
503
|
504
|
prefixchroot=
|
504
|
|
- userhome=/home/$MY_USERNAME
|
505
|
505
|
if [ $rootdir ]; then
|
506
|
506
|
prefix=$rootdir
|
507
|
507
|
prefixchroot="chroot $rootdir"
|
|
@@ -566,10 +566,10 @@ function install_stunnel {
|
566
|
566
|
systemctl enable stunnel
|
567
|
567
|
systemctl daemon-reload
|
568
|
568
|
systemctl start stunnel
|
569
|
|
- fi
|
570
|
569
|
|
571
|
|
- cp $prefix/etc/stunnel/stunnel-client.conf $prefix$userhome/stunnel-client.conf
|
572
|
|
- chown $MY_USERNAME:$MY_USERNAME $prefix$userhome/stunnel*
|
|
570
|
+ cp /etc/stunnel/stunnel-client.conf /home/$MY_USERNAME/stunnel-client.conf
|
|
571
|
+ chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/stunnel*
|
|
572
|
+ fi
|
573
|
573
|
}
|
574
|
574
|
|
575
|
575
|
function vpn_generate_keys {
|