Fixes #5799: Correct syslog-ng configuration maintenance

Normation · Dec 4, 2014 · 39ca4bd · 39ca4bd
1 parent 5fc036d
commit 39ca4bd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/techniques/system/common/1.0/promises.st b/techniques/system/common/1.0/promises.st
@@ -344,6 +344,7 @@ bundle agent check_log_system
 {
 
   vars:
+
     debian::
 
       "syslog_ng_source" string => "s_src";
@@ -357,12 +358,15 @@ bundle agent check_log_system
       "syslog_ng_source" string => "s_sys";
 
     any::
+
       "syslog_conf_comment"   string => "# Autogenerated by rudder, do not edit${const.n}";
+
       "syslog_ng_conf_prefix" string => "filter f_local_rudder{facility(local6) and program(\"rudder.*\");};destination loghost {tcp(\"";
       "syslog_ng_conf_suffix" string => "\" port (&SYSLOGPORT&));};log {source(${syslog_ng_source});filter(f_local_rudder);destination(loghost);";
       "syslog_ng_conf_final"  string => "flags(final);};";
+
       "syslog_ng_conf"        string => concat("${syslog_conf_comment}", "${syslog_ng_conf_prefix}", "${server_info.cfserved}", "${syslog_ng_conf_suffix}", "${syslog_ng_conf_final}");
-      "syslog_ng_conf_regex"  string => concat(escape("${syslog_ng_conf_prefix}"), "[^\"]+", escape("${syslog_ng_conf_suffix}"), ".*");
+      "syslog_ng_conf_regex"  string => concat("filter\ f\_local\_rudder\{facility\(local6\)\ and\ program\(\"rudder\.\*\"\)\;\}\;destination\ loghost\ \{(tcp|udp)\(\"", "[^\"]+", escape("${syslog_ng_conf_suffix}"), ".*");
 
   classes: