apache: add parameter for munin-stats port, else vservers clash

puppet-modules · Sep 18, 2007 · f6e7fe7 · f6e7fe7
1 parent 459d599
commit f6e7fe7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -72,6 +72,7 @@
 	}
 
 	# munin integration
+	$real_munin_stats_port = $munin_stats_port ? { '' => 8666, default => $munin_stats_port }
 	package { "libwww-perl": ensure => installed }
 	config_file { "/etc/apache2/sites-available/munin-stats":
 		content => template("apache/munin-stats"),
@@ -83,7 +84,7 @@
 	munin::plugin {
 		[ "apache_accesses", "apache_processes", "apache_volume" ]:
 			ensure => present,
-			config => "env.url http://${hostname}:8666/server-status?auto"
+			config => "env.url http://${hostname}:${real_munin_stats_port}/server-status?auto"
 	}
 
 # defines from http://reductivelabs.com/trac/puppet/wiki/Recipes/DebianApache2Recipe

diff --git a/templates/munin-stats b/templates/munin-stats
@@ -1,9 +1,9 @@
 # create a virtual host which provides statistics for munin
 ExtendedStatus on
 # hide this a little bit from "normal" accesses
-Listen 8666
-NameVirtualHost *:8666
-<VirtualHost *:8666>
+Listen <%= real_munin_stats_port %>
+NameVirtualHost *:<%= real_munin_stats_port %>
+<VirtualHost *:<%= real_munin_stats_port %>>
 	ServerName <%= hostname %>
 	<Directory />
 		Order deny,allow