|
 |
ee1b47 |
From a76a98b08de120f90a2c51fa43a86288ba6aebf8 Mon Sep 17 00:00:00 2001
|
|
|
ee1b47 |
From: David Lutterkort <lutter@watzmann.net>
|
|
|
ee1b47 |
Date: Wed, 13 Jun 2018 19:24:38 -0700
|
|
|
ee1b47 |
Subject: [PATCH] Rsyslog: support include() directive
|
|
|
ee1b47 |
|
|
|
ee1b47 |
---
|
|
|
ee1b47 |
lenses/rsyslog.aug | 2 +-
|
|
|
ee1b47 |
lenses/tests/test_rsyslog.aug | 6 ++++++
|
|
|
ee1b47 |
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
ee1b47 |
|
|
|
ee1b47 |
diff --git a/lenses/rsyslog.aug b/lenses/rsyslog.aug
|
|
|
ee1b47 |
index 6648f3de..35f19a5b 100644
|
|
|
ee1b47 |
--- a/lenses/rsyslog.aug
|
|
|
ee1b47 |
+++ b/lenses/rsyslog.aug
|
|
|
ee1b47 |
@@ -33,7 +33,7 @@ let config_object_param = [ key /[A-Za-z.]+/ . Sep.equal . Quote.dquote
|
|
|
ee1b47 |
let config_sep = del /[ \t]+|[ \t]*#.*\n[ \t]*/ " "
|
|
|
ee1b47 |
|
|
|
ee1b47 |
let config_object =
|
|
|
ee1b47 |
- [ key /action|global|input|module|parser|timezone/ .
|
|
|
ee1b47 |
+ [ key /action|global|input|module|parser|timezone|include/ .
|
|
|
ee1b47 |
Sep.lbracket .
|
|
|
ee1b47 |
config_object_param . ( config_sep . config_object_param )* .
|
|
|
ee1b47 |
Sep.rbracket . Util.comment_or_eol ]
|
|
|
ee1b47 |
diff --git a/lenses/tests/test_rsyslog.aug b/lenses/tests/test_rsyslog.aug
|
|
|
ee1b47 |
index b71d32c5..5386f836 100644
|
|
|
ee1b47 |
--- a/lenses/tests/test_rsyslog.aug
|
|
|
ee1b47 |
+++ b/lenses/tests/test_rsyslog.aug
|
|
|
ee1b47 |
@@ -199,3 +199,9 @@ test Rsyslog.lns get "module(load=\"imuxsock\" # provides support for local s
|
|
|
ee1b47 |
{ "SysSock.Use" = "off" }
|
|
|
ee1b47 |
{ "#comment" = "Turn off message reception via local log socket;" } }
|
|
|
ee1b47 |
{ "#comment" = "local messages are retrieved through imjournal now." }
|
|
|
ee1b47 |
+
|
|
|
ee1b47 |
+(* Added in rsyslog 8.33 *)
|
|
|
ee1b47 |
+test Rsyslog.lns get "include(file=\"/etc/rsyslog.d/*.conf\" mode=\"optional\")\n" =
|
|
|
ee1b47 |
+ { "include"
|
|
|
ee1b47 |
+ { "file" = "/etc/rsyslog.d/*.conf" }
|
|
|
ee1b47 |
+ { "mode" = "optional" } }
|
|
|
ee1b47 |
--
|
|
|
ee1b47 |
2.17.2
|
|
|
ee1b47 |
|