Merge pull request #540 from szynaka/apt_conf_comments

Added additional header template for apt.conf style comments
puppetlabs · Jun 22, 2015 · a1907ff · a1907ff
2 parents 5dafbd5 + ec1c50a
commit a1907ff
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/manifests/conf.pp b/manifests/conf.pp
@@ -13,6 +13,6 @@
   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
@@ -67,7 +67,7 @@
   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 @@
 
   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
@@ -0,0 +1 @@
+// This file is managed by Puppet. DO NOT EDIT.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		// This file is managed by Puppet. DO NOT EDIT.