diff options
22 files changed, 272 insertions, 67 deletions
@@ -19,7 +19,9 @@ config.status config.sub configure debian/files +debian/tmp debian/vyatta-cfg-system +debian/vyatta-cfg-system-extra debian/vyatta-cfg-system.postinst debian/*.log debian/*.substvars diff --git a/debian/changelog b/debian/changelog index e124f32b..b20b5f92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,150 @@ +vyatta-cfg-system (0.20.66) unstable; urgency=low + + * login: force vyatta user's to have vbash as shell + + -- Stephen Hemminger <shemming@brocade.com> Thu, 02 May 2013 14:37:30 -0700 + +vyatta-cfg-system (0.20.65) unstable; urgency=low + + * Cleanup package dependencies + + -- Stephen Hemminger <shemming@brocade.com> Thu, 25 Apr 2013 08:30:45 -0700 + +vyatta-cfg-system (0.20.64) unstable; urgency=low + + * don't error if file does not exist when doing setcap + + -- Stephen Hemminger <shemming@brocade.com> Wed, 24 Apr 2013 14:19:12 -0700 + +vyatta-cfg-system (0.20.63) unstable; urgency=low + + * Cleanup fix for 8711 + + -- John Southworth <john.southworth@vyatta.com> Wed, 17 Apr 2013 17:03:20 -0700 + +vyatta-cfg-system (0.20.62) unstable; urgency=low + + * Replace original config file handling behaviour + + -- James Davidson <james.davidson@vyatta.com> Wed, 17 Apr 2013 10:54:02 -0700 + +vyatta-cfg-system (0.20.61) unstable; urgency=low + + * Bugfix 8711: Switch to Bash syntax for conditionals + + -- John Southworth <john.southworth@vyatta.com> Fri, 12 Apr 2013 12:00:17 -0700 + +vyatta-cfg-system (0.20.60) unstable; urgency=low + + * Bugfix 8526: don't use REQUIRED on remote-ip + + -- John Southworth <john.southworth@vyatta.com> Fri, 12 Apr 2013 09:24:24 -0700 + +vyatta-cfg-system (0.20.59) unstable; urgency=low + + * snmpv3: enable strict warnings and fix perlcritic + * ethernet: deleting device should put in admin down + + -- Stephen Hemminger <shemming@brocade.com> Tue, 02 Apr 2013 17:20:16 -0700 + +vyatta-cfg-system (0.20.58) unstable; urgency=low + + * Fix typo in domain-name delete action + + -- James Davidson <james.davidson@vyatta.com> Mon, 01 Apr 2013 09:33:16 -0700 + +vyatta-cfg-system (0.20.57) unstable; urgency=low + + * syslog: fix channel syntax + + -- Stephen Hemminger <stephen@networkplumber.org> Fri, 29 Mar 2013 09:28:00 -0700 + +vyatta-cfg-system (0.20.56) unstable; urgency=low + + * fix device naming on boot + + -- Stephen Hemminger <stephen@networkplumber.org> Thu, 28 Mar 2013 16:47:32 -0700 + +vyatta-cfg-system (0.20.55) unstable; urgency=low + + * Initial SNMPv3 support + * Sync up SNMPv3 support + * SNMP: Add multicast smux peers + + -- James Davidson <james.davidson@vyatta.com> Thu, 28 Mar 2013 12:52:44 -0700 + +vyatta-cfg-system (0.20.54) unstable; urgency=low + + * More repackaging + + -- Stephen Hemminger <stephen@networkplumber.org> Thu, 28 Feb 2013 10:06:28 -0800 + +vyatta-cfg-system (0.20.53) unstable; urgency=low + + * Fix another missed directory in debian install file + + -- John Southworth <john.southworth@vyatta.com> Wed, 27 Feb 2013 13:47:15 -0800 + +vyatta-cfg-system (0.20.52) unstable; urgency=low + + * Fix missed directories in debian install file + + -- John Southworth <john.southworth@vyatta.com> Tue, 26 Feb 2013 11:46:27 -0800 + +vyatta-cfg-system (0.20.51) unstable; urgency=low + + * Split off pseudo devices to a sub package + + -- Stephen Hemminger <stephen.hemminger@vyatta.com> Wed, 20 Feb 2013 18:15:18 -0800 + +vyatta-cfg-system (0.20.50) unstable; urgency=low + + * syslog: add dataplane as alias for local6 + + -- Stephen Hemminger <stephen@networkplumber.org> Tue, 12 Feb 2013 20:47:12 -0800 + +vyatta-cfg-system (0.20.49) unstable; urgency=low + + * Skip biosdevname if running in Xen + + -- James Davidson <james.davidson@vyatta.com> Wed, 06 Feb 2013 15:42:18 -0800 + +vyatta-cfg-system (0.20.48) unstable; urgency=low + + * Add ability to restart services when hostname changes + + -- James Davidson <james.davidson@vyatta.com> Tue, 29 Jan 2013 10:02:24 -0800 + +vyatta-cfg-system (0.20.47) unstable; urgency=low + + * Bug 7856: Set default neighbour table size to 8192 + + -- James Davidson <james.davidson@vyatta.com> Tue, 08 Jan 2013 15:49:37 -0800 + +vyatta-cfg-system (0.20.46) unstable; urgency=low + + * Ignore speed setting if auto and no speed available + + -- Stephen Hemminger <shemminger@vyatta.com> Thu, 03 Jan 2013 09:59:34 -0800 + +vyatta-cfg-system (0.20.45) unstable; urgency=low + + * revert 918bd40d3e3f238a800b1486f70e2d5ee1d71a72 + + -- John Southworth <john.southworth@vyatta.com> Wed, 12 Dec 2012 14:40:19 -0800 + +vyatta-cfg-system (0.20.44) unstable; urgency=low + + * Detect overlayfs in livecd and skip passwd check + + -- James Davidson <james.davidson@vyatta.com> Fri, 19 Oct 2012 17:26:06 -0700 + +vyatta-cfg-system (0.20.43) unstable; urgency=low + + * Support and switch to overlayfs + + -- James Davidson <james.davidson@vyatta.com> Fri, 19 Oct 2012 16:02:20 -0700 + vyatta-cfg-system (0.20.42+daisy18) unstable; urgency=low * Replace original config file handling behaviour diff --git a/debian/control b/debian/control index 09afddb0..2a8e4204 100644 --- a/debian/control +++ b/debian/control @@ -7,56 +7,58 @@ Standards-Version: 3.7.2 Package: vyatta-cfg-system Architecture: any -Depends: acpid, +Depends: acpid, adduser, + apt-transport-https, + bridge-utils, + coreutils (>= 5.97-5.3), + cpufrequtils, + curl, + ddclient (>= 3.7.3-4.2), dialog, - sed (>= 4.1.5), - perl (>= 5.10.1), + dmidecode, + dnsmasq (>= 2.45-1+lenny1), + ed, + ethtool, + grub-pc (>= 1.98+20100804), + ifupdown, + installation-report, + iputils-arping, + ipvsadm (>= 1:1.24-2.1), + libc6 (>= 2.7-6), + libcap2-bin (>= 2.19), + libio-socket-ssl-perl, libnetaddr-ip-perl, - procps (>= 1:3.2.7-3), - coreutils (>= 5.97-5.3), libpam-radius-auth, - vyatta-cfg (>= 0.100.1), - libc6 (>= 2.7-6), libpam-runtime (>= 1.0.1-5), - vyatta-bash | bash (>= 3.1), - sysv-rc, + lsof, + mdadm, + mgetty, ntp (>= 4.2.4p6+vyatta-7), - udev (>= 160-1), + openssh-server (>= 1:5.1p1-5), + perl (>= 5.10.1), + procps (>= 1:3.2.7-3), + radvd (>= 1:1.1-3), rsyslog | system-log-daemon, - vyatta-busybox, - sudo, + sed (>= 4.1.5), + snmp, snmpd (>= 5.4.2.1-vyatta11), - vyatta-keepalived (>= 1.1.15-1-vyatta-5), - bridge-utils, - ethtool, ssh (>= 1:5.1p1-5), - openssh-server (>= 1:5.1p1-5), - ed, - ifupdown, + sudo, + sysv-rc, + tcpdump, tshark, - iputils-arping, - installation-report, - laptop-detect, + udev (>= 160-1), usbutils, - mgetty, - tasksel, - snmp, - tcpdump, - dnsmasq (>= 2.45-1+lenny1), - mdadm, - ddclient (>= 3.7.3-4.2), - libio-socket-ssl-perl, - vyatta-biosdevname, - ipvsadm (>= 1:1.24-2.1), - radvd (>= 1:1.1-3), - apt-transport-https, - hostapd (>= 1:0.6.9-3), - cpufrequtils, - grub-pc (>= 1.98+20100804), - libcap2-bin (>= 2.19) + vyatta-bash | bash (>= 3.1), + vyatta-biosdevname | biosdevname, + vyatta-busybox, + vyatta-cfg (>= 0.100.1), + vyatta-keepalived (>= 1.1.15-1-vyatta-5), + whois Pre-Depends: bash-completion -Suggests: util-linux (>= 2.13-5), +Suggests: gawk, + util-linux (>= 2.13-5), net-tools, ncurses-bin (>= 5.5-5), ntpdate @@ -64,3 +66,9 @@ Replaces: vyatta-cfg (<< 0.17.33), vyatta-cfg-quagga (<< 0.18.17) Description: Vyatta system-level configuration Vyatta system-level configuration utiliites, templates and scripts. + +Package: vyatta-cfg-system-extra +Architecture: all +Depends: vyatta-cfg-system +Description: vyatta-cfg-system extra templates + Vyatta configuration templates for additional pseudo-devices diff --git a/debian/rules b/debian/rules index 0ae83713..d7b64807 100755 --- a/debian/rules +++ b/debian/rules @@ -9,13 +9,14 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +SUBPKGS= vyatta-cfg-system vyatta-cfg-system-extra # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) PACKAGE=vyatta-cfg-system -PKGDIR=$(CURDIR)/debian/$(PACKAGE) +PKGDIR=$(CURDIR)/debian/tmp CFLAGS = -Wall -g @@ -72,7 +73,10 @@ install: build $(MAKE) DESTDIR=$(PKGDIR) install - install -D --mode=0644 debian/lintian $(PKGDIR)/usr/share/lintian/overrides/$(PACKAGE) + for p in $(SUBPKGS); do \ + install -D --mode=0644 debian/$$p.lintian-overrides \ + debian/$$p/usr/share/lintian/overrides/$$p; \ + done # Build architecture-independent files here. binary-indep: build install @@ -81,7 +85,7 @@ binary-indep: build install dh_testroot dh_installchangelogs ChangeLog dh_installdocs - dh_install + dh_install --sourcedir=debian/tmp dh_installdebconf dh_link dh_strip diff --git a/debian/vyatta-cfg-system-extra.install b/debian/vyatta-cfg-system-extra.install new file mode 100644 index 00000000..55def17a --- /dev/null +++ b/debian/vyatta-cfg-system-extra.install @@ -0,0 +1,2 @@ +opt/vyatta/share/vyatta-cfg/templates/interfaces/pseudo-ethernet +opt/vyatta/share/vyatta-cfg/templates/interfaces/bonding diff --git a/debian/vyatta-cfg-system-extra.lintian-overrides b/debian/vyatta-cfg-system-extra.lintian-overrides new file mode 100644 index 00000000..32409cd5 --- /dev/null +++ b/debian/vyatta-cfg-system-extra.lintian-overrides @@ -0,0 +1,2 @@ +vyatta-cfg-system-extra: file-in-unusual-dir +vyatta-cfg-system-extra: dir-or-file-in-opt diff --git a/debian/vyatta-cfg-system.install b/debian/vyatta-cfg-system.install new file mode 100644 index 00000000..50e3139a --- /dev/null +++ b/debian/vyatta-cfg-system.install @@ -0,0 +1,14 @@ +etc +lib +opt/vyatta/bin +opt/vyatta/sbin +opt/vyatta/etc +opt/vyatta/share/perl5 +opt/vyatta/share/vyatta-cfg/templates/service +opt/vyatta/share/vyatta-cfg/templates/interfaces/node.def +opt/vyatta/share/vyatta-cfg/templates/interfaces/bridge +opt/vyatta/share/vyatta-cfg/templates/interfaces/ethernet +opt/vyatta/share/vyatta-cfg/templates/interfaces/loopback +opt/vyatta/share/vyatta-cfg/templates/interfaces/tunnel +opt/vyatta/share/vyatta-cfg/templates/interfaces/vti +opt/vyatta/share/vyatta-cfg/templates/system diff --git a/debian/lintian b/debian/vyatta-cfg-system.lintian-overrides index cf586ff3..cf586ff3 100644 --- a/debian/lintian +++ b/debian/vyatta-cfg-system.lintian-overrides diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index cf9eecdb..caa435c1 100755 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -104,8 +104,9 @@ if [ "$sysconfdir" != "/etc" ]; then # Set file capabilities sed -r -e '/^#/d' -e '/^[[:blank:]]*$/d' < $sysconfdir/filecaps | \ while read capability path; do - touch -c $path - setcap $capability $path + if [ -e $path ]; then + setcap $capability $path + fi done # Install pam_cap config diff --git a/lib/Vyatta/Login/User.pm b/lib/Vyatta/Login/User.pm index 411aed6c..1bf058d6 100755 --- a/lib/Vyatta/Login/User.pm +++ b/lib/Vyatta/Login/User.pm @@ -158,12 +158,13 @@ sub _update_user { # make new user using vyatta shell # and make home directory (-m) # and with default group of 100 (users) - $cmd = 'useradd -s /bin/vbash -m -N'; + $cmd = 'useradd -m -N'; } else { # update existing account $cmd = "usermod"; } + $cmd .= " -s /bin/vbash"; $cmd .= " -p '$pwd'"; $cmd .= " -c \"$fname\"" if ( defined $fname ); $cmd .= " -d \"$home\"" if ( defined $home ); diff --git a/scripts/install/install-functions b/scripts/install/install-functions index 0c2210fb..1929d1b3 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -285,7 +285,7 @@ is_union_install () return 1 fi if grep -q ' /live/image [^ ]\+ rw' /proc/mounts \ - && grep -q 'unionfs / unionfs ' /proc/mounts; then + && egrep -q '(union|overlay)fs / (union|overlay)fs ' /proc/mounts; then return 0 else return 1 @@ -328,6 +328,24 @@ get_new_version () # couldn't find it } +# Generate mount options based on the type of union mount +gen_mopts () +{ + local mnttype=$1 + local upper=$2 + local lower=$3 + local mntpoint=$4 + + case "$1" in + overlayfs) + echo "-t $mnttype -o noatime,upperdir=$upper,lowerdir=$lower $mnttype $mntpoint" + ;; + *) + echo "-t $mnttype -o noatime,dirs=$upper=rw:$lower=ro $mnttype $mntpoint" + ;; + esac +} + # try to mount. log any errors and return the appropriate status. # $1: arguments for mount try_mount () diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing index 54881043..6df418ee 100755 --- a/scripts/install/install-image-existing +++ b/scripts/install/install-image-existing @@ -156,8 +156,7 @@ if ! try_mount "-o loop,ro $target_squash $READ_ROOT"; then fi # set up root for postinst -margs="-t unionfs -o noatime,dirs=$RW_DIR=rw:$READ_ROOT=ro unionfs" -margs="$margs $INST_ROOT" +margs=$(gen_mopts "overlayfs" $RW_DIR $READ_ROOT $INST_ROOT) if ! try_mount "$margs"; then rm -rf $REL_ROOT failure_exit 'Failed to set up root directory for postinst.' diff --git a/scripts/install/install-image-new b/scripts/install/install-image-new index 3097392a..5c87c1ea 100755 --- a/scripts/install/install-image-new +++ b/scripts/install/install-image-new @@ -94,7 +94,7 @@ if ! try_mount "-o loop,ro -t squashfs $target_squash $READ_ROOT"; then echo 'Exiting...' exit 1 fi -margs="-t unionfs -o noatime,dirs=$rw_dir=rw:$READ_ROOT=ro unionfs $INST_ROOT" +margs=$(gen_mopts "overlayfs" $rw_dir $READ_ROOT $INST_ROOT) if ! try_mount "$margs"; then echo 'Exiting...' exit 1 diff --git a/scripts/system/vyatta_update_syslog.pl b/scripts/system/vyatta_update_syslog.pl index 3421d61a..7d12284e 100755 --- a/scripts/system/vyatta_update_syslog.pl +++ b/scripts/system/vyatta_update_syslog.pl @@ -65,6 +65,7 @@ sub get_target_param { my %facmap = ( 'all' => '*', 'protocols' => 'local7', + 'dataplane' => 'local6', ); # This builds a data structure that maps from target @@ -93,7 +94,7 @@ sub print_outchannel { # Force outchannel size to be 1k more than logrotate config to guarantee rotation $size = ($size + 5) * 1024; print $fh "\$outchannel $channel,$target,$size,/usr/sbin/logrotate ${LOGROTATE_CFG_DIR}/$channel\n"; - print $fh join( ';', @{ $entries{$target}{selector} } ), " \$$channel\n"; + print $fh join( ';', @{ $entries{$target}{selector} } ), " :omfile:\$$channel\n"; } my $config = new Vyatta::Config; diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl index c455bb74..0ead1b17 100755 --- a/scripts/vyatta-interfaces.pl +++ b/scripts/vyatta-interfaces.pl @@ -471,6 +471,10 @@ sub set_speed_duplex { # read old values to avoid meaningless speed changes my ($autoneg, $ospeed, $oduplex) = get_ethtool($intf); + # some devices do not report settings + # assume these are 'auto' + return if ((! defined($ospeed)) && $nspeed eq 'auto'); + if (defined($autoneg) && $autoneg == 1) { # Device is already in autonegotiation mode return if ($nspeed eq 'auto'); diff --git a/sysconf/vyatta-log.conf b/sysconf/vyatta-log.conf index 77d51a76..0b9015f7 100644 --- a/sysconf/vyatta-log.conf +++ b/sysconf/vyatta-log.conf @@ -1 +1 @@ -*.notice;local7.debug -/var/log/messages +*.notice;local6.debug;local7.debug -/var/log/messages diff --git a/templates/interfaces/tunnel/node.tag/remote-ip/node.def b/templates/interfaces/tunnel/node.tag/remote-ip/node.def index 6da2fb4d..889de693 100644 --- a/templates/interfaces/tunnel/node.tag/remote-ip/node.def +++ b/templates/interfaces/tunnel/node.tag/remote-ip/node.def @@ -2,7 +2,6 @@ type: ipv4, ipv6 help: Remote IP address for this tunnel val_help: ipv4; Remote IPv4 address for this tunnel val_help: ipv6; Remote IPv6 address for this tunnel ->>>>>>> b2159cb... Bugfix 8526: don't use REQUIRED on remote-ip update:case "$VAR(../encapsulation/@)" in "gre-bridge") diff --git a/templates/system/syslog/console/facility/node.def b/templates/system/syslog/console/facility/node.def index 4082a46f..0513a6ae 100644 --- a/templates/system/syslog/console/facility/node.def +++ b/templates/system/syslog/console/facility/node.def @@ -1,9 +1,10 @@ tag: type: txt help: Facility for console logging -syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility" -allowed: echo auth authpriv cron daemon kern lpr mail mark news protocols \ - security syslog user uucp \ +syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "dataplane", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all" ; + "\"$VAR(@)\" is not a valid logging facility" +allowed: echo auth authpriv cron daemon dataplane kern lpr mail mark news \ + protocols security syslog user uucp \ local0 local1 local2 local3 local4 local5 local6 local7 all val_help: all; All facilities excluding "mark" diff --git a/templates/system/syslog/file/node.tag/facility/node.def b/templates/system/syslog/file/node.tag/facility/node.def index 8544bfba..8c74e7c8 100644 --- a/templates/system/syslog/file/node.tag/facility/node.def +++ b/templates/system/syslog/file/node.tag/facility/node.def @@ -1,10 +1,10 @@ tag: type: txt help: Facility for file logging -syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility" - -allowed: echo auth authpriv cron daemon kern lpr mail mark news protocols \ - security syslog user uucp \ +syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "dataplane", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all" ; + "\"$VAR(@)\" is not a valid logging facility" +allowed: echo auth authpriv cron daemon dataplane kern lpr mail mark news \ + protocols security syslog user uucp \ local0 local1 local2 local3 local4 local5 local6 local7 all val_help: all; All facilities excluding "mark" diff --git a/templates/system/syslog/global/facility/node.def b/templates/system/syslog/global/facility/node.def index 58198d9f..13320c7c 100644 --- a/templates/system/syslog/global/facility/node.def +++ b/templates/system/syslog/global/facility/node.def @@ -1,9 +1,10 @@ tag: type: txt help: Facility for system logging -syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all" ; "\"$VAR(@)\" is not a valid logging facility" -allowed: echo auth authpriv cron daemon kern lpr mail mark news protocols \ - security syslog user uucp \ +syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "dataplane", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all" ; + "\"$VAR(@)\" is not a valid logging facility" +allowed: echo auth authpriv cron daemon dataplane kern lpr mail mark news \ + protocols security syslog user uucp \ local0 local1 local2 local3 local4 local5 local6 local7 all val_help: all; All facilities excluding "mark" diff --git a/templates/system/syslog/host/node.tag/facility/node.def b/templates/system/syslog/host/node.tag/facility/node.def index 76b8f793..0e0ce9b5 100644 --- a/templates/system/syslog/host/node.tag/facility/node.def +++ b/templates/system/syslog/host/node.tag/facility/node.def @@ -1,12 +1,12 @@ tag: type: txt help: Facility for host logging -syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility" -allowed: echo auth authpriv cron daemon kern lpr mail mark news protocols \ - security syslog user uucp \ +syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "dataplane", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all" ; + "\"$VAR(@)\" is not a valid logging facility" +allowed: echo auth authpriv cron daemon dataplane kern lpr mail mark news \ + protocols security syslog user uucp \ local0 local1 local2 local3 local4 local5 local6 local7 all - val_help: all; All facilities excluding "mark" val_help: auth; Authentication and authorization val_help: authpriv; Non-system authorization diff --git a/templates/system/syslog/user/node.tag/facility/node.def b/templates/system/syslog/user/node.tag/facility/node.def index c5cfad72..b43a6d61 100644 --- a/templates/system/syslog/user/node.tag/facility/node.def +++ b/templates/system/syslog/user/node.tag/facility/node.def @@ -1,8 +1,9 @@ tag: type: txt help: Facility for user logging -syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility" -allowed: echo auth authpriv cron daemon kern lpr mail mark news protocols \ +syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "dataplane", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all" ; + "\"$VAR(@)\" is not a valid logging facility" +allowed: echo auth authpriv cron daemon dataplane kern lpr mail mark news protocols \ security syslog user uucp \ local0 local1 local2 local3 local4 local5 local6 local7 all |