summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apache
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2015-04-07 16:20:39 -0400
committervarac <varacanero@zeromail.org>2015-04-08 17:57:34 +0200
commit27cd49653769979c3797df340d761a184cea0fec (patch)
tree0ec9b523fa5db6be7f804eaf1e9423c5a4a9722e /puppet/modules/site_apache
parentdbe413c969a54be0a91fe1de1930eb20d885deb6 (diff)
Disable passenger when pnp4nagios is being fetched, this is part of
Change-Id: I21e9af3ef76f19924e58df5b40f4097d42fbf1cd
Diffstat (limited to 'puppet/modules/site_apache')
-rw-r--r--puppet/modules/site_apache/templates/vhosts.d/common.conf.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
index 43bd1076..ee5cd707 100644
--- a/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
+++ b/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
@@ -57,7 +57,7 @@
<% if (defined? @services) and (@services.include? 'monitor') -%>
- <DirectoryMatch (/usr/share/nagios3/htdocs|/usr/lib/cgi-bin/nagios3|/etc/nagios3/stylesheets)>
+ <DirectoryMatch (/usr/share/nagios3/htdocs|/usr/lib/cgi-bin/nagios3|/etc/nagios3/stylesheets|/usr/share/pnp4nagios)>
<% if (defined? @services) and (@services.include? 'webapp') -%>
PassengerEnabled off
<% end -%>