From c669ce00eba4cd466f270a313abf1645b1149564 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Mon, 4 Nov 2013 15:36:17 +0100
Subject: Replace the 'syslog' facility (5) by 'user' (1).

'syslog' is meant for the messages generated internally by syslogd,
whereas 'user' is for user-level messages.
---
 roles/common/files/etc/network/if-pre-up.d/iptables  | 6 +++---
 roles/common/files/usr/local/sbin/update-firewall.sh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'roles')

diff --git a/roles/common/files/etc/network/if-pre-up.d/iptables b/roles/common/files/etc/network/if-pre-up.d/iptables
index 514f774..644211f 100755
--- a/roles/common/files/etc/network/if-pre-up.d/iptables
+++ b/roles/common/files/etc/network/if-pre-up.d/iptables
@@ -22,7 +22,7 @@ log="/usr/bin/logger -st firewall"
 # We support only IPv4 and IPv6.
 [ "$ADDRFAM" = inet -o "$ADDRFAM" = inet6 ] || exit 0
 
-$log -p syslog.info -- "Loading $ADDRFAM firewall on interface $IFACE."
+$log -p user.info -- "Loading $ADDRFAM firewall on interface $IFACE."
 
 case "$ADDRFAM" in
     inet) iptr=/sbin/iptables-restore;  rules=rules.v4;;
@@ -30,9 +30,9 @@ case "$ADDRFAM" in
 esac
 rules="/etc/iptables/$rules"
 
-$iptr < $rules 2>&1 | $log -p syslog.err
+$iptr < $rules 2>&1 | $log -p user.err
 rv=$?
 
-[ $rv -gt 0 ] && $log -p syslog.alert \
+[ $rv -gt 0 ] && $log -p user.alert \
     "WARN: Failed to load iptables rulesets; the machine may be unprotected!"
 exit $rv
diff --git a/roles/common/files/usr/local/sbin/update-firewall.sh b/roles/common/files/usr/local/sbin/update-firewall.sh
index 2e16711..84e076a 100755
--- a/roles/common/files/usr/local/sbin/update-firewall.sh
+++ b/roles/common/files/usr/local/sbin/update-firewall.sh
@@ -52,10 +52,10 @@ usage() {
 }
 
 log() {
-    /usr/bin/logger -st firewall -p syslog.info -- "$@"
+    /usr/bin/logger -st firewall -p user.info -- "$@"
 }
 fatal() {
-    /usr/bin/logger -st firewall -p syslog.err  -- "$@"
+    /usr/bin/logger -st firewall -p user.err  -- "$@"
     exit 1
 }
 
-- 
cgit v1.2.3