From: Ed Szynaka <szynaka@localnet.com>
Date: Fri, 19 Jun 2015 06:01:48 +0000 (-0400)
Subject: Added additional header template for apt.conf style comments
X-Git-Tag: 2.1.1~2^2^2~4^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ec1c50a4ad4749c30a23b1905b879ae00bdee035;hp=5dafbd514dc77eb7116ccc1c6df6775a5ce08e9a;p=puppet-modules%2Fpuppetlabs-apt.git

Added additional header template for apt.conf style comments
---

diff --git a/manifests/conf.pp b/manifests/conf.pp
index da6d64e..c0cd55b 100644
--- 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 ded13f2..48c4f53 100644
--- 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
index 0000000..bfa365e
--- /dev/null
+++ b/templates/_conf_header.erb
@@ -0,0 +1 @@
+// This file is managed by Puppet. DO NOT EDIT.