diff -urN smeserver-softethervpn-server-4.34.old/createlinks smeserver-softethervpn-server-4.34/createlinks --- smeserver-softethervpn-server-4.34.old/createlinks 2021-01-21 10:57:07.229999694 +0000 +++ smeserver-softethervpn-server-4.34/createlinks 2021-01-21 10:58:34.334827527 +0000 @@ -6,7 +6,7 @@ #service_link_enhanced("vpnserver", "S87", "7"); #Add an update event - auto executed by yum on install etc. -$event="smeserver-softethervpn-server--update"; +$event="smeserver-softethervpn-server-update"; foreach my $file (qw( /etc/systemd/system-preset/49-koozali.preset /etc/raddb/users diff -urN smeserver-softethervpn-server-4.34.old/root/etc/e-smith/templates-custom/etc/httpd/conf/httpd.conf/35SSL00Listen443 smeserver-softethervpn-server-4.34/root/etc/e-smith/templates-custom/etc/httpd/conf/httpd.conf/35SSL00Listen443 --- smeserver-softethervpn-server-4.34.old/root/etc/e-smith/templates-custom/etc/httpd/conf/httpd.conf/35SSL00Listen443 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-softethervpn-server-4.34/root/etc/e-smith/templates-custom/etc/httpd/conf/httpd.conf/35SSL00Listen443 2021-01-21 12:53:07.953404510 +0000 @@ -0,0 +1,25 @@ +{ + my $listen_default = "Listen 0.0.0.0:$httpsPort"; + + my $mode = $SystemMode || "serveronly"; + + return $listen_default if ($mode eq "serveronly"); + + my $httpdAccess = ${'httpd-e-smith'}{access} || 'private'; + + my $httpsOnlyLocal = ${'httpd-e-smith'}{httpsOnlyLocal} || 'disabled'; + + return $listen_default unless ($httpdAccess eq "private") || ($httpsOnlyLocal eq "enabled"); + + # Only selectively bind interfaces if we are in private server/gateway mode + + my @ipAddresses = ("127.0.0.1", $LocalIP); + + # Remove any duplicate IP addresses + my %ipAddresses = map { $_ => 1 } @ipAddresses; + foreach my $ip (sort keys %ipAddresses) + { + $OUT .= "Listen $ip:$httpsPort\n"; + } +} + diff -urN smeserver-softethervpn-server-4.34.old/root/etc/e-smith/templates-custom/etc/httpd/conf/httpd.conf/35SSL00Listen443: smeserver-softethervpn-server-4.34/root/etc/e-smith/templates-custom/etc/httpd/conf/httpd.conf/35SSL00Listen443: --- smeserver-softethervpn-server-4.34.old/root/etc/e-smith/templates-custom/etc/httpd/conf/httpd.conf/35SSL00Listen443: 2020-03-28 19:14:50.000000000 +0000 +++ smeserver-softethervpn-server-4.34/root/etc/e-smith/templates-custom/etc/httpd/conf/httpd.conf/35SSL00Listen443: 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -{ - my $listen_default = "Listen 0.0.0.0:443"; - - my $mode = $SystemMode || "serveronly"; - - return $listen_default if ($mode eq "serveronly"); - - my $httpdAccess = ${'httpd-e-smith'}{access} || 'private'; - - my $httpsOnlyLocal = ${'httpd-e-smith'}{httpsOnlyLocal} || 'disabled'; - - return $listen_default unless ($httpdAccess eq "private") || ($httpsOnlyLocal eq "enabled"); - - # Only selectively bind interfaces if we are in private server/gateway mode - - my @ipAddresses = ("127.0.0.1", $LocalIP); - - # Remove any duplicate IP addresses - my %ipAddresses = map { $_ => 1 } @ipAddresses; - foreach my $ip (sort keys %ipAddresses) - { - $OUT .= "Listen $ip:443\n"; - } -} - diff -urN smeserver-softethervpn-server-4.34.old/root/usr/lib/systemd/system/vpnserver.service.d/51koozali.conf smeserver-softethervpn-server-4.34/root/usr/lib/systemd/system/vpnserver.service.d/51koozali.conf --- smeserver-softethervpn-server-4.34.old/root/usr/lib/systemd/system/vpnserver.service.d/51koozali.conf 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-softethervpn-server-4.34/root/usr/lib/systemd/system/vpnserver.service.d/51koozali.conf 2021-01-21 11:41:25.300237436 +0000 @@ -0,0 +1,10 @@ +[Service] +EnvironmentFile= +ExecStart= +ExecStop= +EnvironmentFile=-/usr/vpnserver +ExecStart=/usr/vpnserver/vpnserver start +ExecStop=/usr/vpnserver/vpnserver stop +[Install] +WantedBy=sme-server.target +