59 lines
2.0 KiB
Diff
59 lines
2.0 KiB
Diff
|
diff -uNr usr.orig/local/openvpn_as/bin/_ovpn-init usr/local/openvpn_as/bin/_ovpn-init
|
||
|
|
--- usr.orig/local/openvpn_as/bin/_ovpn-init 2014-12-12 13:43:39.080479338 +0100
|
||
|
|
+++ usr/local/openvpn_as/bin/_ovpn-init 2014-12-12 13:44:43.930476590 +0100
|
||
|
|
@@ -866,41 +866,6 @@
|
||
|
|
print "Error: Could not initialize confdb."
|
||
|
|
sys.exit(1)
|
||
|
|
|
||
|
|
-# Execute gen script...
|
||
|
|
-print "Generating init scripts..."
|
||
|
|
-GEN = "/usr/local/openvpn_as/scripts/openvpnas_gen_init"
|
||
|
|
-retv = commands.getstatusoutput( GEN )
|
||
|
|
-if DEBUG: print "gen init cmd=", GEN, retv
|
||
|
|
-if retv[0] != 0:
|
||
|
|
- print "Error: Could not generate server script."
|
||
|
|
- sys.exit(1)
|
||
|
|
-
|
||
|
|
-# Generate PAM config
|
||
|
|
-print "Generating PAM config..."
|
||
|
|
-GENPAM = "/usr/local/openvpn_as/scripts/openvpnas_gen_pam"
|
||
|
|
-retv = commands.getstatusoutput( GENPAM )
|
||
|
|
-if DEBUG: print "gen pam cmd=", GENPAM, retv
|
||
|
|
-if retv[0] != 0:
|
||
|
|
- print "Error: Could not generate PAM config."
|
||
|
|
- sys.exit(1)
|
||
|
|
-
|
||
|
|
-# Execute gen script auto...
|
||
|
|
-print "Generating init scripts auto command..."
|
||
|
|
-GEN2 = "/usr/local/openvpn_as/scripts/openvpnas_gen_init --auto"
|
||
|
|
-retv = commands.getstatusoutput( GEN2 )
|
||
|
|
-if DEBUG: print "gen init cmd 2=", GEN2, retv
|
||
|
|
-if retv[0] != 0:
|
||
|
|
- print "Error: Could not generate server script auto."
|
||
|
|
- sys.exit(1)
|
||
|
|
-GENAUTO = retv[1]
|
||
|
|
-
|
||
|
|
-# Execute the auto gen script...
|
||
|
|
-retv = commands.getstatusoutput( GENAUTO )
|
||
|
|
-if retv[0] != 0:
|
||
|
|
- print "Error: Could not execute command to generate startup/shutdown scripts"
|
||
|
|
- sys.exit(1)
|
||
|
|
-if DEBUG: print "gen auto cmd=", GENAUTO, retv
|
||
|
|
-
|
||
|
|
# Perform iptables command to force initialization...
|
||
|
|
IPTABLES_NULL = "iptables --list"
|
||
|
|
retv = commands.getstatusoutput( IPTABLES_NULL )
|
||
|
|
@@ -917,7 +882,6 @@
|
||
|
|
if DEBUG: print "server init=", retv
|
||
|
|
if retv[0] != 0:
|
||
|
|
print "Error: Could not execute server start."
|
||
|
|
- sys.exit(1)
|
||
|
|
|
||
|
|
# Print exit messages...
|
||
|
|
print
|
||
|
|
@@ -973,3 +937,4 @@
|
||
|
|
print "See the Release Notes for this release at:"
|
||
|
|
print " http://www.openvpn.net/access-server/rn/openvpn_as_%s.html" % VERSION.replace('.', '_')
|
||
|
|
print
|
||
|
|
+
|