Drop redundant content_only template

Author: silug

manifests/config.pp

@@ -126,15 +126,13 @@
   )
 
   # Join all configuration lines
-  $content = $config_lines.join("\n")
+  $content = "# sssd::config\n[sssd]\n${$config_lines.join("\n")}\n"
 
   file { '/etc/sssd/sssd.conf':
     owner   => 'root',
     group   => 'root',
     mode    => '0600',
-    content => epp("${module_name}/content_only.epp", {
-        'content' => "# sssd::config\n[sssd]\n${content}",
-    }),
+    content => $content,
     notify  => Class["${module_name}::service"],
   }
 }

manifests/service/autofs.pp

@@ -75,14 +75,7 @@
     # Combine all configuration entries in the expected order
     $_all_entries = $_base_content + $_description_entries + $_debug_level_entries + $_debug_timestamps_entries + $_debug_microseconds_entries + $_autofs_negative_timeout_entries
 
-    $_final_content = "${_all_entries.join("\n")}"
-
-    $_content = epp(
-      "${module_name}/content_only.epp",
-      {
-        'content' => $_final_content,
-      },
-    )
+    $_content = "${_all_entries.join("\n")}\n"
   }
 
   sssd::config::entry { 'puppet_service_autofs':

manifests/service/ifp.pp

@@ -92,14 +92,7 @@
     # Combine all configuration entries in the expected order
     $_all_entries = $_base_content + $_description_entries + $_debug_level_entries + $_debug_timestamps_entries + $_debug_microseconds_entries + $_allowed_uids_entries + $_user_attributes_entries + $_wildcard_limit_entries
 
-    $_final_content = "${_all_entries.join("\n")}"
-
-    $_content = epp(
-      "${module_name}/content_only.epp",
-      {
-        'content' => $_final_content,
-      },
-    )
+    $_content = "${_all_entries.join("\n")}\n"
   }
 
   sssd::config::entry { 'puppet_service_ifp':

manifests/service/pac.pp

@@ -74,14 +74,7 @@
     # Combine all configuration entries in the expected order
     $_all_entries = $_base_content + $_description_entries + $_debug_level_entries + $_debug_timestamps_entries + $_debug_microseconds_entries + $_allowed_uids_entries
 
-    $_final_content = "${_all_entries.join("\n")}"
-
-    $_content = epp(
-      "${module_name}/content_only.epp",
-      {
-        'content' => $_final_content,
-      },
-    )
+    $_content = "${_all_entries.join("\n")}\n"
   }
 
   sssd::config::entry { 'puppet_service_pac':

manifests/service/ssh.pp

@@ -82,14 +82,7 @@
     # Combine all configuration entries in the expected order
     $_all_entries = $_base_content + $_description_entries + $_debug_level_entries + $_debug_timestamps_entries + $_debug_microseconds_entries + $_ssh_hash_known_hosts_entries + $_ssh_known_hosts_timeout_entries
 
-    $_final_content = "${_all_entries.join("\n")}"
-
-    $_content = epp(
-      "${module_name}/content_only.epp",
-      {
-        'content' => $_final_content,
-      },
-    )
+    $_content = "${_all_entries.join("\n")}\n"
   }
 
   sssd::config::entry { 'puppet_service_ssh':

manifests/service/sudo.pp

@@ -77,14 +77,7 @@
     # Combine all configuration entries in the expected order
     $_all_entries = $_base_content + $_description_entries + $_debug_level_entries + $_debug_timestamps_entries + $_debug_microseconds_entries + $_sudo_timed_entries
 
-    $_final_content = "${_all_entries.join("\n")}"
-
-    $_content = epp(
-      "${module_name}/content_only.epp",
-      {
-        'content' => $_final_content,
-      },
-    )
+    $_content = "${_all_entries.join("\n")}\n"
   }
 
   sssd::config::entry { 'puppet_service_sudo':