From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 20 Mar 2017 15:39:12 +0000 (+0100)
Subject: move munin.conf_per_node.erb to the right place
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=63cd5189774fd9905eccb756701ac1e086297fa4;hp=275fe950d0ea795fdc9dfa87c1c3276b97ca5d73;p=mirror%2Fdsa-puppet.git

move munin.conf_per_node.erb to the right place
---

diff --git a/modules/munin/munin.conf_per_node.erb b/modules/munin/munin.conf_per_node.erb
deleted file mode 100644
index 421d0dd61..000000000
--- a/modules/munin/munin.conf_per_node.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-##
-### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-##
-
-[<%= client_fqdn %>]
-<%
-# variables are different whether or not they go via the stored config thing.
-#  on the host that actually gets the config, client_munin_async is a String, saying "true",
-#  from other hosts it's an actual boolean, i.e. an instance of either FalseClass or TrueClass
-%>
-<%- if has_variable?('client_munin_async') and ((client_munin_async.kind_of?(String) and client_munin_async == "true") or (client_munin_async.kind_of?(TrueClass))) %>
-    address ssh://munin-async@<%= client_fqdn %>/set-in-authkeys
-<%- else %>
-    address <%= client_ipaddress %>
-<%- end %>
diff --git a/modules/munin/templates/munin.conf_per_node.erb b/modules/munin/templates/munin.conf_per_node.erb
new file mode 100644
index 000000000..421d0dd61
--- /dev/null
+++ b/modules/munin/templates/munin.conf_per_node.erb
@@ -0,0 +1,15 @@
+##
+### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+##
+
+[<%= client_fqdn %>]
+<%
+# variables are different whether or not they go via the stored config thing.
+#  on the host that actually gets the config, client_munin_async is a String, saying "true",
+#  from other hosts it's an actual boolean, i.e. an instance of either FalseClass or TrueClass
+%>
+<%- if has_variable?('client_munin_async') and ((client_munin_async.kind_of?(String) and client_munin_async == "true") or (client_munin_async.kind_of?(TrueClass))) %>
+    address ssh://munin-async@<%= client_fqdn %>/set-in-authkeys
+<%- else %>
+    address <%= client_ipaddress %>
+<%- end %>