(simp#150) Changed legacy control character params into global params

Fixes simp#150

CHANGELOG

@@ -1,3 +1,6 @@
+* Wed May 15 2024 Mike Riddle <[email protected]> - 8.8.0
+- Moved legacy control character parms into global params
+
 * Tue Feb 27 2024 Mike Riddle <[email protected]> - 8.7.0
 - Added a parameter that allows users to define rsyslog rules via hieradata
 

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "simp-rsyslog",
-  "version": "8.7.0",
+  "version": "8.8.0",
   "author": "SIMP Team",
   "summary": "A puppet module to support RSyslog version 8.",
   "license": "Apache-2.0",

spec/classes/expected/global_default.txt

@@ -1,6 +1,4 @@
 $UMASK 0027
-$EscapeControlCharactersOnReceive on
-$ControlCharacterEscapePrefix #
 $RepeatedMsgReduction on
 
 global(
@@ -9,6 +7,8 @@ global(
   workDirectory="/var/spool/rsyslog"
   net.permitACLWarning="on"
   net.enableDNS="on"
+  parser.escapeControlCharactersOnReceive="on"
+  parser.controlCharacterEscapePrefix="#"
 )
 
 global(localHostname="foo.example.com")

spec/classes/expected/global_extra_globals.txt

@@ -1,6 +1,4 @@
 $UMASK 0027
-$EscapeControlCharactersOnReceive on
-$ControlCharacterEscapePrefix #
 $RepeatedMsgReduction on
 $FailOnChownFailure on
 $AbortOnUncleanConfig on
@@ -11,6 +9,8 @@ global(
   workDirectory="/var/spool/rsyslog"
   net.permitACLWarning="on"
   net.enableDNS="on"
+  parser.escapeControlCharactersOnReceive="on"
+  parser.controlCharacterEscapePrefix="#"
 )
 
 global(localHostname="foo.example.com")

spec/classes/expected/global_extra_main_queue_params.txt

@@ -1,6 +1,4 @@
 $UMASK 0027
-$EscapeControlCharactersOnReceive on
-$ControlCharacterEscapePrefix #
 $RepeatedMsgReduction on
 
 global(
@@ -9,6 +7,8 @@ global(
   workDirectory="/var/spool/rsyslog"
   net.permitACLWarning="on"
   net.enableDNS="on"
+  parser.escapeControlCharactersOnReceive="on"
+  parser.controlCharacterEscapePrefix="#"
 )
 
 global(localHostname="foo.example.com")

spec/classes/expected/global_extra_misc_input_module_params.txt

@@ -1,6 +1,4 @@
 $UMASK 0027
-$EscapeControlCharactersOnReceive on
-$ControlCharacterEscapePrefix #
 $RepeatedMsgReduction on
 
 global(
@@ -9,6 +7,8 @@ global(
   workDirectory="/var/spool/rsyslog"
   net.permitACLWarning="on"
   net.enableDNS="on"
+  parser.escapeControlCharactersOnReceive="on"
+  parser.controlCharacterEscapePrefix="#"
 )
 
 global(localHostname="foo.example.com")

spec/classes/expected/global_extra_tcp_server_input_module_params.txt

@@ -1,6 +1,4 @@
 $UMASK 0027
-$EscapeControlCharactersOnReceive on
-$ControlCharacterEscapePrefix #
 $RepeatedMsgReduction on
 
 global(
@@ -9,6 +7,8 @@ global(
   workDirectory="/var/spool/rsyslog"
   net.permitACLWarning="on"
   net.enableDNS="on"
+  parser.escapeControlCharactersOnReceive="on"
+  parser.controlCharacterEscapePrefix="#"
 )
 
 global(localHostname="foo.example.com")

spec/classes/expected/global_extra_tls_tcp_server_input_module_params.txt

@@ -1,6 +1,4 @@
 $UMASK 0027
-$EscapeControlCharactersOnReceive on
-$ControlCharacterEscapePrefix #
 $RepeatedMsgReduction on
 
 global(
@@ -9,6 +7,8 @@ global(
   workDirectory="/var/spool/rsyslog"
   net.permitACLWarning="on"
   net.enableDNS="on"
+  parser.escapeControlCharactersOnReceive="on"
+  parser.controlCharacterEscapePrefix="#"
 )
 
 global(localHostname="foo.example.com")

spec/classes/expected/global_extra_udp_server_input_module_params.txt

@@ -1,6 +1,4 @@
 $UMASK 0027
-$EscapeControlCharactersOnReceive on
-$ControlCharacterEscapePrefix #
 $RepeatedMsgReduction on
 
 global(
@@ -9,6 +7,8 @@ global(
   workDirectory="/var/spool/rsyslog"
   net.permitACLWarning="on"
   net.enableDNS="on"
+  parser.escapeControlCharactersOnReceive="on"
+  parser.controlCharacterEscapePrefix="#"
 )
 
 global(localHostname="foo.example.com")

spec/classes/expected/global_tcp_server.txt

@@ -1,6 +1,4 @@
 $UMASK 0027
-$EscapeControlCharactersOnReceive on
-$ControlCharacterEscapePrefix #
 $RepeatedMsgReduction on
 
 global(
@@ -9,6 +7,8 @@ global(
   workDirectory="/var/spool/rsyslog"
   net.permitACLWarning="on"
   net.enableDNS="on"
+  parser.escapeControlCharactersOnReceive="on"
+  parser.controlCharacterEscapePrefix="#"
 )
 
 global(localHostname="foo.example.com")

spec/classes/expected/global_tls_logging.txt

@@ -1,6 +1,4 @@
 $UMASK 0027
-$EscapeControlCharactersOnReceive on
-$ControlCharacterEscapePrefix #
 $RepeatedMsgReduction on
 
 global(
@@ -9,6 +7,8 @@ global(
   workDirectory="/var/spool/rsyslog"
   net.permitACLWarning="on"
   net.enableDNS="on"
+  parser.escapeControlCharactersOnReceive="on"
+  parser.controlCharacterEscapePrefix="#"
 )
 
 global(localHostname="foo.example.com")

spec/classes/expected/global_tls_tcp_server.txt

@@ -1,6 +1,4 @@
 $UMASK 0027
-$EscapeControlCharactersOnReceive on
-$ControlCharacterEscapePrefix #
 $RepeatedMsgReduction on
 
 global(
@@ -9,6 +7,8 @@ global(
   workDirectory="/var/spool/rsyslog"
   net.permitACLWarning="on"
   net.enableDNS="on"
+  parser.escapeControlCharactersOnReceive="on"
+  parser.controlCharacterEscapePrefix="#"
 )
 
 global(localHostname="foo.example.com")

spec/classes/expected/global_udp_server.txt

@@ -1,6 +1,4 @@
 $UMASK 0027
-$EscapeControlCharactersOnReceive on
-$ControlCharacterEscapePrefix #
 $RepeatedMsgReduction on
 
 global(
@@ -9,6 +7,8 @@ global(
   workDirectory="/var/spool/rsyslog"
   net.permitACLWarning="on"
   net.enableDNS="on"
+  parser.escapeControlCharactersOnReceive="on"
+  parser.controlCharacterEscapePrefix="#"
 )
 
 global(localHostname="foo.example.com")

templates/config/pre_logging.conf.erb

@@ -62,8 +62,6 @@
 #   want it.
 -%>
 $UMASK <%= @umask %>
-$EscapeControlCharactersOnReceive <%= t_bool_xlat[@escape_control_characters_on_receive] %>
-$ControlCharacterEscapePrefix <%= @control_character_escape_prefix %>
 $RepeatedMsgReduction <%= t_bool_xlat[@repeated_msg_reduction] %>
 <% if @extra_legacy_globals -%>
 <%   @extra_legacy_globals.each do |name,value| -%>
@@ -93,6 +91,8 @@ global(
   workDirectory="<%= @work_directory %>"
   net.permitACLWarning="<%= t_bool_xlat[@net_permit_acl_warning] %>"
   net.enableDNS="<%= t_bool_xlat[@net_enable_dns] %>"
+  parser.escapeControlCharactersOnReceive="<%= t_bool_xlat[@escape_control_characters_on_receive] %>"
+  parser.controlCharacterEscapePrefix="<%= @control_character_escape_prefix %>"
 )
 
 global(localHostname="<%= @localhostname %>")