diff options
| author | varac <varacanero@zeromail.org> | 2015-04-08 15:50:50 +0000 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-04-08 15:50:50 +0000 |
| commit | 98fb2d7c6aa30d9754b97420d122abc0e9e7e949 (patch) | |
| tree | 0ec9b523fa5db6be7f804eaf1e9423c5a4a9722e /puppet | |
| parent | dbe413c969a54be0a91fe1de1930eb20d885deb6 (diff) | |
| parent | 424fd79912c760d734f606602aa81e26d44937e1 (diff) | |
Merge branch 'feature/6645' into 'develop'
Feature/6645
This along with https://gitlab.com/shared-puppet-modules-group/nagios/merge_requests/2 should solve
https://leap.se/code/issues/6645
See merge request !39
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/modules/site_apache/templates/vhosts.d/common.conf.erb | 2 |
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 -%> |