Permalink
Browse files

Merge branch 'master' into openbsd_integration

  • Loading branch information...
2 parents 7fe82cf + 50e6a65 commit 9dd987158cab100ed45db35dcc9ea7bcb7d01c9f @mrash committed Apr 17, 2012
@@ -131,7 +131,7 @@ SHOW_ALL_SIGNATURES N;
### syslog and email messages). "ALL" is the default. Both "nosyslog"
### and "noemail" can be combined with a comma to disable all logging
### and alerting.
-ALERTING_METHODS ALL;
+ALERTING_METHODS nomail;
### By default, psad acquires iptables log data from the /var/log/messages
### file which the local syslog daemon (usually) writes iptables log messages
@@ -131,7 +131,7 @@ SHOW_ALL_SIGNATURES N;
### syslog and email messages). "ALL" is the default. Both "nosyslog"
### and "noemail" can be combined with a comma to disable all logging
### and alerting.
-ALERTING_METHODS ALL;
+ALERTING_METHODS nomail;
### By default, psad acquires iptables log data from the /var/log/messages
### file which the local syslog daemon (usually) writes iptables log messages
@@ -131,7 +131,7 @@ SHOW_ALL_SIGNATURES N;
### syslog and email messages). "ALL" is the default. Both "nosyslog"
### and "noemail" can be combined with a comma to disable all logging
### and alerting.
-ALERTING_METHODS ALL;
+ALERTING_METHODS nomail;
### By default, psad acquires iptables log data from the /var/log/messages
### file which the local syslog daemon (usually) writes iptables log messages
@@ -131,7 +131,7 @@ SHOW_ALL_SIGNATURES N;
### syslog and email messages). "ALL" is the default. Both "nosyslog"
### and "noemail" can be combined with a comma to disable all logging
### and alerting.
-ALERTING_METHODS ALL;
+ALERTING_METHODS nomail;
### By default, psad acquires iptables log data from the /var/log/messages
### file which the local syslog daemon (usually) writes iptables log messages
@@ -131,7 +131,7 @@ SHOW_ALL_SIGNATURES N;
### syslog and email messages). "ALL" is the default. Both "nosyslog"
### and "noemail" can be combined with a comma to disable all logging
### and alerting.
-ALERTING_METHODS ALL;
+ALERTING_METHODS nomail;
### By default, psad acquires iptables log data from the /var/log/messages
### file which the local syslog daemon (usually) writes iptables log messages
@@ -131,7 +131,7 @@ SHOW_ALL_SIGNATURES N;
### syslog and email messages). "ALL" is the default. Both "nosyslog"
### and "noemail" can be combined with a comma to disable all logging
### and alerting.
-ALERTING_METHODS ALL;
+ALERTING_METHODS nomail;
### By default, psad acquires iptables log data from the /var/log/messages
### file which the local syslog daemon (usually) writes iptables log messages
@@ -131,7 +131,7 @@ SHOW_ALL_SIGNATURES N;
### syslog and email messages). "ALL" is the default. Both "nosyslog"
### and "noemail" can be combined with a comma to disable all logging
### and alerting.
-ALERTING_METHODS ALL;
+ALERTING_METHODS nomail;
### By default, psad acquires iptables log data from the /var/log/messages
### file which the local syslog daemon (usually) writes iptables log messages

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit 9dd9871

Please sign in to comment.