summaryrefslogtreecommitdiffstats
path: root/roles/common/files
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2013-11-04 15:36:17 +0100
committerGuilhem Moulin <guilhem@fripost.org>2015-06-07 02:50:44 +0200
commitc669ce00eba4cd466f270a313abf1645b1149564 (patch)
treeb1612b4107dc93a5a7409a3e2263438f7e8813fa /roles/common/files
parent51ea7eca6ca198606a71c107bb67d64186761456 (diff)
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.
Diffstat (limited to 'roles/common/files')
-rwxr-xr-xroles/common/files/etc/network/if-pre-up.d/iptables6
-rwxr-xr-xroles/common/files/usr/local/sbin/update-firewall.sh4
2 files changed, 5 insertions, 5 deletions
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
}