webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 19:00:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into next

Browse Source 
Conflicts:
	config/rootfiles/packages/clamav
	lfs/clamav
This commit is contained in:
Michael Tremer
2015-03-04 23:58:47 +01:00
parent 8d289021d3 80b0f82fef
commit 274ebe1d9d
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
html/cgi-bin/vpnmain.cgi
View File

@@ -437,6 +437,14 @@ sub writeipsecfiles {
}
print CONF "\n";
}#foreach key
# Add post user includes to config file
# After the GUI-connections allows to patch connections.
if (-e "/etc/ipsec.user-post.conf") {
print CONF "include /etc/ipsec.user-post.conf\n";
print CONF "\n";
}
print SECRETS $last_secrets if ($last_secrets);
close(CONF);
close(SECRETS);