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 794039d0863a519959e7f261f2d47a2d8b185e99..a17b986cbd5a46087aa3cfe5404af30f095b75dd 100644 (file)
--- 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 e68229a3fd07b010b78bab2cf83557a952030060..5ccf71ee098bc9380a61c5a3808ee327b3218ee9 100644 (file)
--- 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 bda49a3e7ba567d78788e3fbb6922ea421ac0edb..26f1793416e8840c9285674e23b7e4c6a356558e 100644 (file)
--- 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";