Merge pull request #248 from m8t/m8t/base_rainerscript

kenyon · web-flow · commit 40440a8adf60 · 2024-08-30T09:46:53.000-07:00
base: rainerscript replacement for `$IncludeConfig`
diff --git a/manifests/base.pp b/manifests/base.pp
@@ -58,7 +58,7 @@
 
     file { $rsyslog::config_file:
       ensure  => file,
-      content => "${message}\n\$IncludeConfig ${rsyslog::confdir}/*.conf\n",
+      content => "${message}\ninclude(file=\"${rsyslog::confdir}/*.conf\" mode=\"optional\")\n",
       mode    => $rsyslog::global_conf_perms,
     }
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@`
`58`	`58`
`59`	`59`	`file { $rsyslog::config_file:`
`60`	`60`	`ensure => file,`
`61`		`- content => "${message}\n\$IncludeConfig ${rsyslog::confdir}/*.conf\n",`
	`61`	`+ content => "${message}\ninclude(file=\"${rsyslog::confdir}/*.conf\" mode=\"optional\")\n",`
`62`	`62`	`mode => $rsyslog::global_conf_perms,`
`63`	`63`	`}`
`64`	`64`