Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rsyslog: bsd-like #!/+/- are just comments without special meaning #595

Merged
merged 1 commit into from
Nov 30, 2018
Merged

Rsyslog: bsd-like #!/+/- are just comments without special meaning #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions lenses/rsyslog.aug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,16 @@ let namedpipe = Syslog.pipe . Sep.space . [ label "pipe" . store Syslog.file_r ]

let action = Syslog.action | omusrmsg | file_tmpl | namedpipe

(* Cannot use syslog program because rsyslog does not suppport #! *)
let program = [ label "program" . Syslog.bang .
( Syslog.opt_plus | [ Build.xchgs "-" "reverse" ] ) .
Syslog.programs . Util.eol . Syslog.entries ]

(* Cannot use syslog hostname because rsyslog does not suppport #+/- *)
let hostname = [ label "hostname" .
( Syslog.plus | [ Build.xchgs "-" "reverse" ] ) .
Syslog.hostnames . Util.eol . Syslog.entries ]

(* View: entry
An entry contains selectors and an action
*)
Expand All @@ -70,9 +80,9 @@ let prop_filter =
in [ label "filter" . prop_name . sep . prop_oper . sep . prop_val .
Sep.space . prop_act . Util.eol ]

let entries = ( Syslog.empty | Syslog.comment | entry | macro | config_object | prop_filter )*
let entries = ( Syslog.empty | Util.comment | entry | macro | config_object | prop_filter )*

let lns = entries . ( Syslog.program | Syslog.hostname )*
let lns = entries . ( program | hostname )*

let filter = incl "/etc/rsyslog.conf"
. incl "/etc/rsyslog.d/*"
Expand Down
5 changes: 5 additions & 0 deletions lenses/tests/test_rsyslog.aug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,11 @@ test Rsyslog.lns get "module(load=\"imuxsock\" # provides support for local s
{ "#comment" = "Turn off message reception via local log socket;" } }
{ "#comment" = "local messages are retrieved through imjournal now." }

(* rsyslog doesn't use bsd-like #! or #+/- specifications *)
test Rsyslog.lns get "#!prog\n" = { "#comment" = "!prog" }
test Rsyslog.lns get "#+host\n" = { "#comment" = "+host" }
test Rsyslog.lns get "#-host\n" = { "#comment" = "-host" }

(* Added in rsyslog 8.33 *)
test Rsyslog.lns get "include(file=\"/etc/rsyslog.d/*.conf\" mode=\"optional\")\n" =
{ "include"
Expand Down