diff options
25 files changed, 9 insertions, 295 deletions
diff --git a/Makefile.am b/Makefile.am index 81f98215..60c90de6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,7 +49,7 @@ sbin_SCRIPTS += scripts/system/vyatta_update_login.pl sbin_SCRIPTS += scripts/system/vyatta_update_logrotate.pl sbin_SCRIPTS += scripts/system/vyatta_update_resolv.pl sbin_SCRIPTS += scripts/system/vyatta_update_sysctl.pl -sbin_SCRIPTS += scripts/system/vyatta_update_syslog.pl +#sbin_SCRIPTS += scripts/system/vyatta_update_syslog.pl sbin_SCRIPTS += scripts/system/vyatta_update_console.pl sbin_SCRIPTS += scripts/system/irq-affinity.pl sbin_SCRIPTS += scripts/snmp/if-mib-alias @@ -115,7 +115,7 @@ cronhourlydir = /etc/cron.hourly cronhourly_SCRIPTS = sysconf/vyatta-logrotate-hourly rsyslogdir = /etc/rsyslog.d -rsyslog_DATA = sysconf/vyatta-log.conf +#rsyslog_DATA = sysconf/vyatta-log.conf curver_DATA = cfg-version/vrrp@2 curver_DATA += cfg-version/system@8 diff --git a/debian/changelog b/debian/changelog index 82e77ecb..5aaaaaa7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ -vyatta-cfg-system (0.20.44+vyos2+current12) unstable; urgency=medium +vyatta-cfg-system (0.20.44+vyos2+current13) unstable; urgency=medium * Update the VRRP syntax version file to 2. -- Daniil Baturin <daniil@baturin.org> Fri, 27 Jul 2018 10:21:44 +0200 + +vyatta-cfg-system (0.20.44+vyos2+current12) unstable; urgency=medium + + * T736: Rewrite remote logging (syslog) to XML/Python + + -- hagbard <vyosdev@derith.de> Tue, 24 Jul 2018 11:13:36 -0700 vyatta-cfg-system (0.20.44+vyos2+current11) unstable; urgency=medium diff --git a/templates/system/syslog/console/facility/node.def b/templates/system/syslog/console/facility/node.def deleted file mode 100644 index 4082a46f..00000000 --- a/templates/system/syslog/console/facility/node.def +++ /dev/null @@ -1,30 +0,0 @@ -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 \ - 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 -val_help: cron; Cron daemon -val_help: daemon; System daemons -val_help: kern; Kernel -val_help: lpr; Line printer spooler -val_help: mail; Mail subsystem -val_help: mark; Timestamp -val_help: news; USENET subsystem -val_help: protocols; Routing protocols (local7) -val_help: security; Authentication and authorization -val_help: syslog; Authentication and authorization -val_help: user; Application processes -val_help: uucp; UUCP subsystem -val_help: local0; Local facility 0 -val_help: local1; Local facility 1 -val_help: local2; Local facility 2 -val_help: local3; Local facility 3 -val_help: local4; Local facility 4 -val_help: local5; Local facility 5 -val_help: local6; Local facility 6 diff --git a/templates/system/syslog/console/facility/node.tag/level/node.def b/templates/system/syslog/console/facility/node.tag/level/node.def deleted file mode 100644 index e69b30d4..00000000 --- a/templates/system/syslog/console/facility/node.tag/level/node.def +++ /dev/null @@ -1,15 +0,0 @@ -type: txt -help: Logging level -syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug", "all"; "\"$VAR(@)\" is not a valid logging level" -default: "err" -allowed: echo emerg alert crit err warning notice info debug all - -val_help: emerg; Emergency messages -val_help: alert; Urgent messages -val_help: crit; Critical messages -val_help: err; Error messages -val_help: warning; Warning messages -val_help: notice; Messages for further investigation -val_help: info; Informational messages -val_help: debug; Debug messages -val_help: all; Log everything diff --git a/templates/system/syslog/console/node.def b/templates/system/syslog/console/node.def deleted file mode 100644 index 4004a9c5..00000000 --- a/templates/system/syslog/console/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Logging to system console -commit:expression: $VAR(./facility/@@) != ""; "At least one facility must be configured to log messages to $VAR(.)" diff --git a/templates/system/syslog/file/node.def b/templates/system/syslog/file/node.def deleted file mode 100644 index ba2fa44f..00000000 --- a/templates/system/syslog/file/node.def +++ /dev/null @@ -1,10 +0,0 @@ -tag: -type: txt -help: Logging to a file - -syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9_.]+$" ; "invalid file name $VAR(@)" - -commit:expression: $VAR(./@/facility/@@) != ""; \ - "At least one facility must be configured to log messages to file $VAR(./@)" - -val_help: Log file name in /var/log/user diff --git a/templates/system/syslog/file/node.tag/archive/files/node.def b/templates/system/syslog/file/node.tag/archive/files/node.def deleted file mode 100644 index bb60506c..00000000 --- a/templates/system/syslog/file/node.tag/archive/files/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: u32 - -help: Number of saved files - -default: 5 diff --git a/templates/system/syslog/file/node.tag/archive/node.def b/templates/system/syslog/file/node.tag/archive/node.def deleted file mode 100644 index 0e7f6b3e..00000000 --- a/templates/system/syslog/file/node.tag/archive/node.def +++ /dev/null @@ -1,4 +0,0 @@ -help: Log file size and rotation characteristics - -delete: - sudo rm -f "/opt/vyatta/etc/logrotate/file_$VAR(../@)" diff --git a/templates/system/syslog/file/node.tag/archive/size/node.def b/templates/system/syslog/file/node.tag/archive/size/node.def deleted file mode 100644 index 0c9a1f7e..00000000 --- a/templates/system/syslog/file/node.tag/archive/size/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: u32 - -help: Size of log files (kbytes) - -default: 0 diff --git a/templates/system/syslog/file/node.tag/facility/node.def b/templates/system/syslog/file/node.tag/facility/node.def deleted file mode 100644 index 8544bfba..00000000 --- a/templates/system/syslog/file/node.tag/facility/node.def +++ /dev/null @@ -1,31 +0,0 @@ -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 \ - 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 -val_help: cron; Cron daemon -val_help: daemon; System daemons -val_help: kern; Kernel -val_help: lpr; Line printer spooler -val_help: mail; Mail subsystem -val_help: mark; Timestamp -val_help: news; USENET subsystem -val_help: protocols; Routing protocols (local7) -val_help: security; Authentication and authorization -val_help: syslog; Authentication and authorization -val_help: user; Application processes -val_help: uucp; UUCP subsystem -val_help: local0; Local facility 0 -val_help: local1; Local facility 1 -val_help: local2; Local facility 2 -val_help: local3; Local facility 3 -val_help: local4; Local facility 4 -val_help: local5; Local facility 5 -val_help: local6; Local facility 6 diff --git a/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def deleted file mode 100644 index e69b30d4..00000000 --- a/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def +++ /dev/null @@ -1,15 +0,0 @@ -type: txt -help: Logging level -syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug", "all"; "\"$VAR(@)\" is not a valid logging level" -default: "err" -allowed: echo emerg alert crit err warning notice info debug all - -val_help: emerg; Emergency messages -val_help: alert; Urgent messages -val_help: crit; Critical messages -val_help: err; Error messages -val_help: warning; Warning messages -val_help: notice; Messages for further investigation -val_help: info; Informational messages -val_help: debug; Debug messages -val_help: all; Log everything diff --git a/templates/system/syslog/global/archive/files/node.def b/templates/system/syslog/global/archive/files/node.def deleted file mode 100644 index bb60506c..00000000 --- a/templates/system/syslog/global/archive/files/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: u32 - -help: Number of saved files - -default: 5 diff --git a/templates/system/syslog/global/archive/node.def b/templates/system/syslog/global/archive/node.def deleted file mode 100644 index 2ec10727..00000000 --- a/templates/system/syslog/global/archive/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Log file size and rotation characteristics diff --git a/templates/system/syslog/global/archive/size/node.def b/templates/system/syslog/global/archive/size/node.def deleted file mode 100644 index 4d360a44..00000000 --- a/templates/system/syslog/global/archive/size/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: u32 - -help: Size of log files (kbytes) - -default: 250 diff --git a/templates/system/syslog/global/facility/node.def b/templates/system/syslog/global/facility/node.def deleted file mode 100644 index 58198d9f..00000000 --- a/templates/system/syslog/global/facility/node.def +++ /dev/null @@ -1,30 +0,0 @@ -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 \ - 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 -val_help: cron; Cron daemon -val_help: daemon; System daemons -val_help: kern; Kernel -val_help: lpr; Line printer spooler -val_help: mail; Mail subsystem -val_help: mark; Timestamp -val_help: news; USENET subsystem -val_help: protocols; Routing protocols (local7) -val_help: security; Authentication and authorization -val_help: syslog; Authentication and authorization -val_help: user; Application processes -val_help: uucp; UUCP subsystem -val_help: local0; Local facility 0 -val_help: local1; Local facility 1 -val_help: local2; Local facility 2 -val_help: local3; Local facility 3 -val_help: local4; Local facility 4 -val_help: local5; Local facility 5 -val_help: local6; Local facility 6 diff --git a/templates/system/syslog/global/facility/node.tag/level/node.def b/templates/system/syslog/global/facility/node.tag/level/node.def deleted file mode 100644 index e69b30d4..00000000 --- a/templates/system/syslog/global/facility/node.tag/level/node.def +++ /dev/null @@ -1,15 +0,0 @@ -type: txt -help: Logging level -syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug", "all"; "\"$VAR(@)\" is not a valid logging level" -default: "err" -allowed: echo emerg alert crit err warning notice info debug all - -val_help: emerg; Emergency messages -val_help: alert; Urgent messages -val_help: crit; Critical messages -val_help: err; Error messages -val_help: warning; Warning messages -val_help: notice; Messages for further investigation -val_help: info; Informational messages -val_help: debug; Debug messages -val_help: all; Log everything diff --git a/templates/system/syslog/global/node.def b/templates/system/syslog/global/node.def deleted file mode 100644 index 3c26df27..00000000 --- a/templates/system/syslog/global/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Logging to system standard location -commit:expression: $VAR(./facility/) != "" || $VAR(./archive/) != ""; "Must specify either facility or archive for syslog file" diff --git a/templates/system/syslog/host/node.def b/templates/system/syslog/host/node.def deleted file mode 100644 index 27b05109..00000000 --- a/templates/system/syslog/host/node.def +++ /dev/null @@ -1,7 +0,0 @@ -tag: -type: txt -help: Logging to a remote host - -commit:expression: $VAR(./@/facility/@@) != ""; "At least one facility must be configured to log messages to host $VAR(./@)" - -val_help: Remote host name or IP address diff --git a/templates/system/syslog/host/node.tag/facility/node.def b/templates/system/syslog/host/node.tag/facility/node.def deleted file mode 100644 index 76b8f793..00000000 --- a/templates/system/syslog/host/node.tag/facility/node.def +++ /dev/null @@ -1,31 +0,0 @@ -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 \ - 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 -val_help: cron; Cron daemon -val_help: daemon; System daemons -val_help: kern; Kernel -val_help: lpr; Line printer spooler -val_help: mail; Mail subsystem -val_help: mark; Timestamp -val_help: news; USENET subsystem -val_help: protocols; Routing protocols (local7) -val_help: security; Authentication and authorization -val_help: syslog; Authentication and authorization -val_help: user; Application processes -val_help: uucp; UUCP subsystem -val_help: local0; Local facility 0 -val_help: local1; Local facility 1 -val_help: local2; Local facility 2 -val_help: local3; Local facility 3 -val_help: local4; Local facility 4 -val_help: local5; Local facility 5 -val_help: local6; Local facility 6 diff --git a/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def deleted file mode 100644 index e69b30d4..00000000 --- a/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def +++ /dev/null @@ -1,15 +0,0 @@ -type: txt -help: Logging level -syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug", "all"; "\"$VAR(@)\" is not a valid logging level" -default: "err" -allowed: echo emerg alert crit err warning notice info debug all - -val_help: emerg; Emergency messages -val_help: alert; Urgent messages -val_help: crit; Critical messages -val_help: err; Error messages -val_help: warning; Warning messages -val_help: notice; Messages for further investigation -val_help: info; Informational messages -val_help: debug; Debug messages -val_help: all; Log everything diff --git a/templates/system/syslog/host/node.tag/facility/node.tag/protocol/node.def b/templates/system/syslog/host/node.tag/facility/node.tag/protocol/node.def deleted file mode 100644 index 469d7a79..00000000 --- a/templates/system/syslog/host/node.tag/facility/node.tag/protocol/node.def +++ /dev/null @@ -1,6 +0,0 @@ -type: txt -help: Syslog communication protocol -syntax:expression: $VAR(@) in "udp", "tcp"; - "Must be \"udp\", or \"tcp\"" -val_help: udp; Send log messages to remote syslog server over UDP -val_help: tcp; Send log messages to remote syslog server over TCP diff --git a/templates/system/syslog/node.def b/templates/system/syslog/node.def deleted file mode 100644 index 81fb3f6c..00000000 --- a/templates/system/syslog/node.def +++ /dev/null @@ -1,5 +0,0 @@ -priority: 400 -help: System logging daemon -end: if /opt/vyatta/sbin/vyatta_update_syslog.pl; then - sudo /usr/sbin/invoke-rc.d rsyslog restart - fi diff --git a/templates/system/syslog/user/node.def b/templates/system/syslog/user/node.def deleted file mode 100644 index be356042..00000000 --- a/templates/system/syslog/user/node.def +++ /dev/null @@ -1,7 +0,0 @@ -tag: -type: txt -help: Logging to specific user's terminal -syntax:expression: pattern $VAR(@) "^[a-zA-Z_][a-zA-Z0-9_-]*$" - ; "invalid user name $VAR(@)" -commit:expression: $VAR(./@/facility/@@) != ""; "At least one facility must be configured to log messages to user $VAR(./@)" -val_help: User login name diff --git a/templates/system/syslog/user/node.tag/facility/node.def b/templates/system/syslog/user/node.tag/facility/node.def deleted file mode 100644 index c5cfad72..00000000 --- a/templates/system/syslog/user/node.tag/facility/node.def +++ /dev/null @@ -1,31 +0,0 @@ -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 \ - 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 -val_help: cron; Cron daemon -val_help: daemon; System daemons -val_help: kern; Kernel -val_help: lpr; Line printer spooler -val_help: mail; Mail subsystem -val_help: mark; Timestamp -val_help: news; USENET subsystem -val_help: protocols; Routing protocols (local7) -val_help: security; Authentication and authorization -val_help: syslog; Authentication and authorization -val_help: user; Application processes -val_help: uucp; UUCP subsystem -val_help: local0; Local facility 0 -val_help: local1; Local facility 1 -val_help: local2; Local facility 2 -val_help: local3; Local facility 3 -val_help: local4; Local facility 4 -val_help: local5; Local facility 5 -val_help: local6; Local facility 6 diff --git a/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def deleted file mode 100644 index e69b30d4..00000000 --- a/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def +++ /dev/null @@ -1,15 +0,0 @@ -type: txt -help: Logging level -syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug", "all"; "\"$VAR(@)\" is not a valid logging level" -default: "err" -allowed: echo emerg alert crit err warning notice info debug all - -val_help: emerg; Emergency messages -val_help: alert; Urgent messages -val_help: crit; Critical messages -val_help: err; Error messages -val_help: warning; Warning messages -val_help: notice; Messages for further investigation -val_help: info; Informational messages -val_help: debug; Debug messages -val_help: all; Log everything |