use windows newlines in puppet.conf

theforeman · Mar 25, 2021 · 8efea88 · 8efea88
1 parent fd3be99
commit 8efea88
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/manifests/config/entry.pp b/manifests/config/entry.pp
@@ -25,17 +25,21 @@
   } else {
     $_value = $value
   }
+  $nl = $facts['os']['family'] ? {
+    'Windows' => "\r\n",
+    default   => "\n",
+  }
 
   # note the spaces at he end of the 'order' parameters,
   # they make sure that '1_main ' is ordered before '1_main_*'
   ensure_resource('concat::fragment', "puppet.conf_${section}", {
       target  => "${puppet::dir}/puppet.conf",
-      content => "\n[${section}]",
+      content => "${nl}[${section}]",
       order   => "${sectionorder}_${section} ",
   })
   ensure_resource('concat::fragment', "puppet.conf_${section}_end", {
       target  => "${puppet::dir}/puppet.conf",
-      content => "\n",
+      content => $nl,
       order   => "${sectionorder}_${section}~end",
   })
 
@@ -44,7 +48,7 @@
   if (!defined(Concat::Fragment["puppet.conf_${section}_${key}"])){
     concat::fragment{"puppet.conf_${section}_${key}":
       target  => "${puppet::dir}/puppet.conf",
-      content => "\n    ${key} = ${_value}",
+      content => "${nl}    ${key} = ${_value}",
       order   => "${sectionorder}_${section}_${key} ",
     }
   } else {