Merge branch 'master' into ppp-update

html/cgi-bin/ids.cgi

@@ -143,7 +143,7 @@ if (-e "/etc/snort/snort.conf") {
 					# If see more than one dashed line, (start to) create rule file description
 					if ($dashlinecnt > 1) {
 						# Check for a line starting with a #
-						if ($ruleline =~ /^\#/) {
+						if ($ruleline =~ /^\#/ and $ruleline !~ /^\#alert/) {
 							# Create tempruleline
 							my $tempruleline = $ruleline;
 

html/cgi-bin/vpnmain.cgi

@@ -289,6 +289,12 @@ sub writeipsecfiles {
     #print CONF "\tdisablearrivalcheck=no\n";
     print CONF "\n";
 
+    # Add user includes to config file
+    print CONF "include /etc/ipsec.user.conf\n";
+    print CONF "\n";
+
+    print SECRETS "include /etc/ipsec.user/secrets\n";
+
     if (-f "${General::swroot}/certs/hostkey.pem") {
         print SECRETS ": RSA ${General::swroot}/certs/hostkey.pem\n"
     }