From 02a8971459a201b9165909593c250122b0c06c1b Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 3 Jun 2013 14:24:20 +0200
Subject: Use @var style for puppet 3.2 compatibility

---
 templates/site.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/site.conf')

diff --git a/templates/site.conf b/templates/site.conf
index 52ddb53..842bde0 100644
--- a/templates/site.conf
+++ b/templates/site.conf
@@ -1,5 +1,5 @@
 <VirtualHost *>
-	ServerName <%= name %>
+	ServerName <%= @name %>
 	DocumentRoot /var/cache/munin/www/
 	<Location />
 		order allow,deny
-- 
cgit v1.2.3


From 057658ba93e2562c596dfa5607836679631be916 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <e.kohlvanwijngaarden@oxilion.nl>
Date: Tue, 2 Jul 2013 22:49:02 +0200
Subject: Unify OS specific munin-conf.conf

In essence all munin-node.conf files contained the same template,
besides a few values. By moving all to a single template, maintenance
burden is reduced. To ensure all values are still present in the
templates, tests are added.
---
 templates/site.conf | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 templates/site.conf

(limited to 'templates/site.conf')

diff --git a/templates/site.conf b/templates/site.conf
deleted file mode 100644
index 842bde0..0000000
--- a/templates/site.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<VirtualHost *>
-	ServerName <%= @name %>
-	DocumentRoot /var/cache/munin/www/
-	<Location />
-		order allow,deny
-		Allow from all
-	</Location>
-</VirtualHost>
-
-- 
cgit v1.2.3