From cfa7eab02f1b43394ad60bf196114e2827cf671b Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 11 May 2013 11:42:03 +0200 Subject: [PATCH] Revert "ipsec: Shut up strongswan logging." This reverts commit 43f4c938c18775afd3ed03295c1dbdbca588d761. Conflicts: config/rootfiles/oldcore/66/update.sh --- config/rootfiles/core/68/filelists/files | 1 + config/rootfiles/core/68/update.sh | 3 +++ html/cgi-bin/vpnmain.cgi | 3 --- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files index 794039d086..a17b986cbd 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 e68229a3fd..5ccf71ee09 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 bda49a3e7b..26f1793416 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"; -- 2.39.5