Merge branch 'apache_indexes' into storageareas

This commit is contained in:
Isaac Connor 2016-11-22 13:29:30 -05:00
commit b3f2b13718
2 changed files with 2 additions and 2 deletions

View File

@ -12,7 +12,7 @@ Alias /zm /usr/share/zoneminder/www
</IfModule> </IfModule>
<IfModule mod_php5.c> <IfModule mod_php5.c>
<Directory /usr/share/zoneminder/www> <Directory /usr/share/zoneminder/www>
Options -Indexes FollowSymLinks Options -Indexes +FollowSymLinks
<IfModule mod_dir.c> <IfModule mod_dir.c>
DirectoryIndex index.php DirectoryIndex index.php
</IfModule> </IfModule>

View File

@ -8,7 +8,7 @@ ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin"
Alias /zm /usr/share/zoneminder/www Alias /zm /usr/share/zoneminder/www
<Directory /usr/share/zoneminder/www> <Directory /usr/share/zoneminder/www>
Options -Indexes +ollowSymLinks Options -Indexes +FollowSymLinks
<IfModule mod_dir.c> <IfModule mod_dir.c>
DirectoryIndex index.php DirectoryIndex index.php
</IfModule> </IfModule>