Recommit for updates in build 18

doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Afiles.html

@@ -151,7 +151,26 @@
 53
 54
 55
-56</pre>
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -160,12 +179,12 @@ class confdroid_alloy::main::files (
 
 ) inherits confdroid_alloy::params {
   require confdroid_alloy::main::dirs
+  include concat
 
-  # Ensure log_targets is always an array
   $log_targets_array = Array($confdroid_alloy::params::ay_log_targets, true)
 
-  file { $ay_main_file:
-    ensure   =&gt; file,
+  concat { $ay_main_file:
+    ensure   =&gt; present,
     owner    =&gt; &#39;root&#39;,
     group    =&gt; &#39;root&#39;,
     mode     =&gt; &#39;0644&#39;,
@@ -173,10 +192,29 @@ class confdroid_alloy::main::files (
     selrole  =&gt; object_r,
     seltype  =&gt; etc_t,
     seluser  =&gt; system_u,
-    content  =&gt; template(&#39;confdroid_alloy/config.alloy.erb&#39;),
     notify   =&gt; Service[$ay_service],
   }
 
+  concat::fragment { &#39;confdroid_alloy_config_header&#39;:
+    target  =&gt; $ay_main_file,
+    content =&gt; template(&#39;confdroid_alloy/config.alloy.erb&#39;),
+    order   =&gt; &#39;001&#39;,
+  }
+
+  if $ay_manage_loki == true {
+    concat::fragment { &#39;confdroid_alloy_log_targets_default&#39;:
+      target  =&gt; $ay_main_file,
+      content =&gt; template(&#39;confdroid_alloy/log_targets.alloy.erb&#39;),
+      order   =&gt; &#39;010&#39;,
+    }
+  }
+
+  concat::fragment { &#39;confdroid_alloy_config_tail&#39;:
+    target  =&gt; $ay_main_file,
+    content =&gt; template(&#39;confdroid_alloy/config.alloy.tail.erb&#39;),
+    order   =&gt; &#39;999&#39;,
+  }
+
   # manage logrotate for rsyslog to allow adm group membership
   file { &#39;/etc/logrotate.d/rsyslog&#39;:
     ensure   =&gt; file,