Added additional header template for apt.conf style comments

diff --git a/manifests/conf.pp b/manifests/conf.pp
index da6d64e738ba8269a053ade34567c3d15624b61a..c0cd55ba9e145b4b2a01437d5903ce3467851d9d 100644 (file)
--- a/manifests/conf.pp
+++ b/manifests/conf.pp
@@ -13,6 +13,6 @@ define apt::conf (
   apt::setting { "conf-${name}":
     ensure   => $ensure,
     priority => $priority,
-    content  => template('apt/_header.erb', 'apt/conf.erb'),
+    content  => template('apt/_conf_header.erb', 'apt/conf.erb'),
   }
 }

diff --git a/manifests/init.pp b/manifests/init.pp
index ded13f2fc46b3bf04f72b422d3338e9bdf357cf8..48c4f53050e8c8baaac5e3a86c307fbc0a38dc36 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -67,7 +67,7 @@ class apt(
   if $proxy['host'] {
     apt::setting { 'conf-proxy':
       priority => '01',
-      content  => template('apt/_header.erb', 'apt/proxy.erb'),
+      content  => template('apt/_conf_header.erb', 'apt/proxy.erb'),
     }
   }
 
@@ -89,7 +89,7 @@ class apt(
 
   apt::setting { 'conf-update-stamp':
     priority => 15,
-    content  => template('apt/_header.erb', 'apt/15update-stamp.erb'),
+    content  => template('apt/_conf_header.erb', 'apt/15update-stamp.erb'),
   }
 
   file { 'sources.list':

diff --git a/templates/_conf_header.erb b/templates/_conf_header.erb
new file mode 100644 (file)
index 0000000..bfa365e
--- /dev/null
+++ b/templates/_conf_header.erb
@@ -0,0 +1 @@
+// This file is managed by Puppet. DO NOT EDIT.