| 1 |
brianr |
1.1 |
diff -urN smeserver-softethervpn-server-4.34.old/createlinks smeserver-softethervpn-server-4.34/createlinks |
| 2 |
|
|
--- smeserver-softethervpn-server-4.34.old/createlinks 2021-01-21 10:57:07.229999694 +0000 |
| 3 |
|
|
+++ smeserver-softethervpn-server-4.34/createlinks 2021-01-21 10:58:34.334827527 +0000 |
| 4 |
|
|
@@ -6,7 +6,7 @@ |
| 5 |
|
|
#service_link_enhanced("vpnserver", "S87", "7"); |
| 6 |
|
|
|
| 7 |
|
|
#Add an update event - auto executed by yum on install etc. |
| 8 |
|
|
-$event="smeserver-softethervpn-server--update"; |
| 9 |
|
|
+$event="smeserver-softethervpn-server-update"; |
| 10 |
|
|
foreach my $file (qw( |
| 11 |
|
|
/etc/systemd/system-preset/49-koozali.preset |
| 12 |
|
|
/etc/raddb/users |
| 13 |
|
|
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 |
| 14 |
|
|
--- 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 |
| 15 |
|
|
+++ 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 |
| 16 |
|
|
@@ -0,0 +1,25 @@ |
| 17 |
|
|
+{ |
| 18 |
|
|
+ my $listen_default = "Listen 0.0.0.0:$httpsPort"; |
| 19 |
|
|
+ |
| 20 |
|
|
+ my $mode = $SystemMode || "serveronly"; |
| 21 |
|
|
+ |
| 22 |
|
|
+ return $listen_default if ($mode eq "serveronly"); |
| 23 |
|
|
+ |
| 24 |
|
|
+ my $httpdAccess = ${'httpd-e-smith'}{access} || 'private'; |
| 25 |
|
|
+ |
| 26 |
|
|
+ my $httpsOnlyLocal = ${'httpd-e-smith'}{httpsOnlyLocal} || 'disabled'; |
| 27 |
|
|
+ |
| 28 |
|
|
+ return $listen_default unless ($httpdAccess eq "private") || ($httpsOnlyLocal eq "enabled"); |
| 29 |
|
|
+ |
| 30 |
|
|
+ # Only selectively bind interfaces if we are in private server/gateway mode |
| 31 |
|
|
+ |
| 32 |
|
|
+ my @ipAddresses = ("127.0.0.1", $LocalIP); |
| 33 |
|
|
+ |
| 34 |
|
|
+ # Remove any duplicate IP addresses |
| 35 |
|
|
+ my %ipAddresses = map { $_ => 1 } @ipAddresses; |
| 36 |
|
|
+ foreach my $ip (sort keys %ipAddresses) |
| 37 |
|
|
+ { |
| 38 |
|
|
+ $OUT .= "Listen $ip:$httpsPort\n"; |
| 39 |
|
|
+ } |
| 40 |
|
|
+} |
| 41 |
|
|
+ |
| 42 |
|
|
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: |
| 43 |
|
|
--- 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 |
| 44 |
|
|
+++ 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 |
| 45 |
|
|
@@ -1,25 +0,0 @@ |
| 46 |
|
|
-{ |
| 47 |
|
|
- my $listen_default = "Listen 0.0.0.0:443"; |
| 48 |
|
|
- |
| 49 |
|
|
- my $mode = $SystemMode || "serveronly"; |
| 50 |
|
|
- |
| 51 |
|
|
- return $listen_default if ($mode eq "serveronly"); |
| 52 |
|
|
- |
| 53 |
|
|
- my $httpdAccess = ${'httpd-e-smith'}{access} || 'private'; |
| 54 |
|
|
- |
| 55 |
|
|
- my $httpsOnlyLocal = ${'httpd-e-smith'}{httpsOnlyLocal} || 'disabled'; |
| 56 |
|
|
- |
| 57 |
|
|
- return $listen_default unless ($httpdAccess eq "private") || ($httpsOnlyLocal eq "enabled"); |
| 58 |
|
|
- |
| 59 |
|
|
- # Only selectively bind interfaces if we are in private server/gateway mode |
| 60 |
|
|
- |
| 61 |
|
|
- my @ipAddresses = ("127.0.0.1", $LocalIP); |
| 62 |
|
|
- |
| 63 |
|
|
- # Remove any duplicate IP addresses |
| 64 |
|
|
- my %ipAddresses = map { $_ => 1 } @ipAddresses; |
| 65 |
|
|
- foreach my $ip (sort keys %ipAddresses) |
| 66 |
|
|
- { |
| 67 |
|
|
- $OUT .= "Listen $ip:443\n"; |
| 68 |
|
|
- } |
| 69 |
|
|
-} |
| 70 |
|
|
- |
| 71 |
|
|
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 |
| 72 |
|
|
--- smeserver-softethervpn-server-4.34.old/root/usr/lib/systemd/system/vpnserver.service.d/51koozali.conf 1970-01-01 01:00:00.000000000 +0100 |
| 73 |
|
|
+++ smeserver-softethervpn-server-4.34/root/usr/lib/systemd/system/vpnserver.service.d/51koozali.conf 2021-01-21 11:41:25.300237436 +0000 |
| 74 |
|
|
@@ -0,0 +1,10 @@ |
| 75 |
|
|
+[Service] |
| 76 |
|
|
+EnvironmentFile= |
| 77 |
|
|
+ExecStart= |
| 78 |
|
|
+ExecStop= |
| 79 |
|
|
+EnvironmentFile=-/usr/vpnserver |
| 80 |
|
|
+ExecStart=/usr/vpnserver/vpnserver start |
| 81 |
|
|
+ExecStop=/usr/vpnserver/vpnserver stop |
| 82 |
|
|
+[Install] |
| 83 |
|
|
+WantedBy=sme-server.target |
| 84 |
|
|
+ |
Parent Directory
| 
Revision Log
| 
Revision Graph
