From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 11 May 2013 09:42:03 +0000 (+0200)
Subject: Revert "ipsec: Shut up strongswan logging."
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=cfa7eab02f1b43394ad60bf196114e2827cf671b;hp=496df9728ea05c266ba72d6db311c92842744e2a

Revert "ipsec: Shut up strongswan logging."

This reverts commit 43f4c938c18775afd3ed03295c1dbdbca588d761.

Conflicts:
	config/rootfiles/oldcore/66/update.sh
---

diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files
index 794039d08..a17b986cb 100644
--- a/config/rootfiles/core/68/filelists/files
+++ b/config/rootfiles/core/68/filelists/files
@@ -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
diff --git a/config/rootfiles/core/68/update.sh b/config/rootfiles/core/68/update.sh
index e68229a3f..5ccf71ee0 100644
--- a/config/rootfiles/core/68/update.sh
+++ b/config/rootfiles/core/68/update.sh
@@ -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
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index bda49a3e7..26f179341 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -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";