switch to using Require all granted from old Options allow,deny

diff --git a/examples/apache.conf b/examples/apache.conf
index 479c35098f86a651b39c09c6c19cea27737bc54c..0c1315d18c674ac853e25f6809fbabf6e61e68e9 100644 (file)
--- a/examples/apache.conf
+++ b/examples/apache.conf
@@ -1,3 +1,4 @@
+# -*- mode: apache; -*-
 <VirtualHost *>
     ServerName bugs.debian.org
     ServerAdmin owner@bugs.debian.org
@@ -6,24 +7,17 @@
     ErrorLog /var/log/apache2/debbugs-error.log
     CustomLog /var/log/apache2/debbugs-access.log combined
 
-    <Directory />
-        Options FollowSymLinks
-        AllowOverride None
-    </Directory>
-
     <Directory /var/lib/debbugs/www>
-        Options -Indexes +FollowSymLinks +MultiViews
-        AllowOverride Options
-        Order allow,deny
-        allow from all
+           Options Indexes SymLinksIfOwnerMatch MultiViews
+           DirectoryIndex index.en.html
+           Require all granted
     </Directory>
 
     ScriptAlias /cgi-bin/ /var/lib/debbugs/www/cgi/
     <Directory "/var/lib/debbugs/www/cgi/">
         AllowOverride None
-        Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-        Order allow,deny
-        Allow from all
+        Options ExecCGI SymLinksIfOwnerMatch
+           Require all granted
     </Directory>
 
     RewriteEngine on
@@ -51,11 +45,4 @@
     RewriteRule .* - [L]
     RewriteRule ^/([0-9]+)$ /cgi-bin/bugreport.cgi?bug=$1 [L,R,NE]
     RewriteRule ^/([^/]+)$ /cgi-bin/pkgreport.cgi?pkg=$1 [L,R,NE]
-    <IfModule mod_perl.c>
-       <Directory /org/bugs.debian.org/cgi-bin/sql>
-           SetHandler  perl-script
-           PerlHandler Apache::Registry
-           Options +ExecCGI
-       </Directory>
-    </IfModule>
 </VirtualHost>