summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-04-08 17:55:51 +0200
committervarac <varacanero@zeromail.org>2015-04-08 17:55:51 +0200
commit300f1d39682d47e7bcc66b82f21dec15bb41b4e9 (patch)
treee4424fcbd21478c52ee370574205dae2980a2eba /files
parentaaf9e3df1c184c934f014f1003d8c2e2776b2b71 (diff)
parentd1ab33dbb66e09f9f8ff2cc61e3e8cc94fef3674 (diff)
Merge remote-tracking branch 'shared/master' into leap_master
Conflicts: manifests/defaults/commands.pp
Diffstat (limited to 'files')
-rw-r--r--files/pnp4nagios/apache.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/files/pnp4nagios/apache.conf b/files/pnp4nagios/apache.conf
index 8f66756..816bf05 100644
--- a/files/pnp4nagios/apache.conf
+++ b/files/pnp4nagios/apache.conf
@@ -27,4 +27,5 @@ Alias /pnp4nagios "/usr/share/pnp4nagios/html"
# Rewrite all other URLs to index.php/URL
RewriteRule .* index.php/$0 [PT,L]
</IfModule>
+ DirectoryIndex index.php
</Directory>