Revert "ipsec: Shut up strongswan logging."

This reverts commit 43f4c938c1.

Conflicts:
	config/rootfiles/oldcore/66/update.sh
This commit is contained in:
Michael Tremer
2013-05-11 11:42:03 +02:00
parent 496df9728e
commit cfa7eab02f
3 changed files with 4 additions and 3 deletions

View File

@@ -4,6 +4,7 @@ etc/modprobe.d/blacklist
srv/web/ipfire/cgi-bin/connections.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/html/themes/ipfire/include/style.css
srv/web/ipfire/html/themes/ipfire/include/functions.pl
srv/web/ipfire/html/themes/maniac/include/style.css

View File

@@ -45,6 +45,9 @@ rm -rf /opt/pakfire/db/*/meta-freefont
#Extract files
extract_files
# Regenerate ipsec configuration files.
/srv/web/ipfire/cgi-bin/vpnmain.cgi
#
#Start services
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then

View File

@@ -245,9 +245,6 @@ sub writeipsecfiles {
flock CONF, 2;
flock SECRETS, 2;
print CONF "version 2\n\n";
print CONF "config setup\n";
print CONF "\tcharondebug=\"dmn 0, mgr 0, ike 0, chd 0, job 0, cfg 0, knl 0, net 0, asn 0, enc 0, lib 0, esp 0, tls 0, tnc 0, imc 0, imv 0, pts 0\"\n";
print CONF "\n";
print CONF "conn %default\n";
print CONF "\tkeyingtries=%forever\n";
print CONF "\n";