From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 31 Aug 2017 21:43:52 +0000 (+0000)
Subject: new concat no longer works with source => <file> on jessie hosts.  Switch to content... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=118cb73d461868b4c61a574279b2fc2ae0144008;hp=5e197fe72fe9bf4fa5a89ee513a3ffc1ea97c8d9;p=mirror%2Fdsa-puppet.git

new concat no longer works with source => <file> on jessie hosts.  Switch to content => template in the one use of that
---

diff --git a/modules/exim/files/virtualdomains.header b/modules/exim/files/virtualdomains.header
deleted file mode 100644
index a1befa174..000000000
--- a/modules/exim/files/virtualdomains.header
+++ /dev/null
@@ -1,19 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-# This file lists the virtual domains that this host should handle. The
-# format is
-#  host: user=user group=group directory=dir
-# Host may be a wildcard.
-# User/Group are the symbolic names of the uid/gid to operate under when
-#    performing deliveries for this name. These should not be root!
-# Directory is the directory to look in for data files. The directory and
-#    files may be group writable. The first file to lookup is DIR/aliases
-#    which is a traditional exim/sendmail alias file. You can specify
-#    users, patterns, pipes and filenames. If that fails then
-#    .forward-foo is tried, should that fail then .forward-default is tried.
-#    Finally the email will bounce.
-
-
diff --git a/modules/exim/manifests/vdomain/setup.pp b/modules/exim/manifests/vdomain/setup.pp
index 2765fba43..14338874e 100644
--- a/modules/exim/manifests/vdomain/setup.pp
+++ b/modules/exim/manifests/vdomain/setup.pp
@@ -9,7 +9,7 @@ class exim::vdomain::setup {
 
 	concat::fragment { 'virtualdomains_header':
 		target => '/etc/exim4/virtualdomains',
-		source => 'puppet:///modules/exim/virtualdomains.header',
+		content => template('exim/virtualdomains.header.erb'),
 		order  => '00',
 	}
 }
diff --git a/modules/exim/templates/virtualdomains.header.erb b/modules/exim/templates/virtualdomains.header.erb
new file mode 100644
index 000000000..a1befa174
--- /dev/null
+++ b/modules/exim/templates/virtualdomains.header.erb
@@ -0,0 +1,19 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+# This file lists the virtual domains that this host should handle. The
+# format is
+#  host: user=user group=group directory=dir
+# Host may be a wildcard.
+# User/Group are the symbolic names of the uid/gid to operate under when
+#    performing deliveries for this name. These should not be root!
+# Directory is the directory to look in for data files. The directory and
+#    files may be group writable. The first file to lookup is DIR/aliases
+#    which is a traditional exim/sendmail alias file. You can specify
+#    users, patterns, pipes and filenames. If that fails then
+#    .forward-foo is tried, should that fail then .forward-default is tried.
+#    Finally the email will bounce.
+
+