Now locals is a template too

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/exim/files/common/locals b/modules/exim/files/common/locals
deleted file mode 100644 (file)
index 3e0ece1..0000000
--- a/modules/exim/files/common/locals
+++ /dev/null
@@ -1,5 +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
-##
-

diff --git a/modules/exim/files/per-host/albeniz.debian.org/locals b/modules/exim/files/per-host/albeniz.debian.org/locals
deleted file mode 100644 (file)
index afb9f59..0000000
--- a/modules/exim/files/per-host/albeniz.debian.org/locals
+++ /dev/null
@@ -1,6 +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
-##
-
-deb-alpha1.sanger.ac.uk

diff --git a/modules/exim/files/per-host/ball.debian.org/locals b/modules/exim/files/per-host/ball.debian.org/locals
deleted file mode 100644 (file)
index ada5e60..0000000
--- a/modules/exim/files/per-host/ball.debian.org/locals
+++ /dev/null
@@ -1,6 +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
-##
-
-ball.einval.com

diff --git a/modules/exim/files/per-host/malo.debian.org/locals b/modules/exim/files/per-host/malo.debian.org/locals
deleted file mode 100644 (file)
index 5555de1..0000000
--- a/modules/exim/files/per-host/malo.debian.org/locals
+++ /dev/null
@@ -1,6 +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
-##
-
-malo.debian.osuosl.org

diff --git a/modules/exim/files/per-host/master.debian.org/locals b/modules/exim/files/per-host/master.debian.org/locals
deleted file mode 100644 (file)
index 108538c..0000000
--- a/modules/exim/files/per-host/master.debian.org/locals
+++ /dev/null
@@ -1,9 +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
-##
-
-master.debian.org
-debian.org
-debian.novare.net
-master.novare.net

diff --git a/modules/exim/files/per-host/rem.debian.org/locals b/modules/exim/files/per-host/rem.debian.org/locals
deleted file mode 100644 (file)
index 2fe93b0..0000000
--- a/modules/exim/files/per-host/rem.debian.org/locals
+++ /dev/null
@@ -1,6 +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
-##
-
-rem.rfc822.org

diff --git a/modules/exim/files/per-host/saens.debian.org/locals b/modules/exim/files/per-host/saens.debian.org/locals
deleted file mode 100644 (file)
index b6f6013..0000000
--- a/modules/exim/files/per-host/saens.debian.org/locals
+++ /dev/null
@@ -1,6 +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
-##
-
-debian-mirror.cs.umn.edu

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 712526f..2d8b237 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -50,8 +50,7 @@ class exim {
           ;
         "/etc/exim4/locals":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/locals",
-                       "puppet:///exim/common/locals" ]
+          content => template("exim/locals.erb")
           ;
         "/etc/exim4/localusers":
           require => Package["exim4-daemon-heavy"],

diff --git a/modules/exim/templates/locals.erb b/modules/exim/templates/locals.erb
new file mode 100644 (file)
index 0000000..deb3597
--- /dev/null
+++ b/modules/exim/templates/locals.erb
@@ -0,0 +1,20 @@
+##
+### 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
+###
+#
+
+<%=
+locals = case fqdn
+        when "albeniz.debian.org" then "deb-alpha1.sanger.ac.uk"
+        when "ball.debian.org" then "ball.einval.com"
+        when "malo.debian.org" then "malo.debian.osuosl.org"
+        when "master.debian.org" then "master.debian.org
+debian.org
+debian.novare.net
+master.novare.net"
+        when "rem.debian.org" then "rem.rfc822.org"
+        when "saens.debian.org" then "debian-mirror.cs.umn.edu"
+end
+locals
+%>