Merge branch 'master' into archive-master

[deb/packages.git] / conf / apache.conf.sed.in

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 2067d8608d57c4c2e4024c9be1b2b78e8a0ea585..aa68eaa7593c12f6f6504ef710c405560b9a030c 100644 (file)
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -8,10 +8,7 @@
 
   # Nice caching..
   ExpiresActive On
-  ExpiresDefault "access plus 1 day"
-  ExpiresByType image/gif  "modification plus 1 year"
-  ExpiresByType image/jpeg "modification plus 1 year"
-  ExpiresByType image/png  "modification plus 1 year"
+  ExpiresDefault "access plus 1 year"
 
   # language stuff
   # you need to keep this in sync with lib/Packages/I18N/Locale.pm
@@ -72,21 +69,21 @@
    ErrorLog /var/log/apache2/%SITE%-error.log
    CustomLog /var/log/apache2/%SITE%-access.log combined
 
-   Alias /cgi-bin/ %TOPDIR%/cgi-bin/
+   ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/
   
    PerlModule ModPerl::Registry
    PerlTaintCheck On
-   PerlRequire %TOPDIR%/bin/mod_perl-startup
+#   PerlRequire %TOPDIR%/bin/mod_perl-startup
    PerlSwitches -T
    <Location /cgi-bin/>
-      SetHandler perl-script
+#      SetHandler perl-script
       # mod-perl etch
-      PerlInitHandler Apache2::Reload
+#      PerlInitHandler Apache2::Reload
       # mod-perl sarge
       #PerlInitHandler Apache::Reload
-      PerlHandler ModPerl::Registry
+#      PerlHandler ModPerl::Registry
       Options +ExecCGI
-      PerlSendHeader On
+#      PerlSendHeader On
       allow from all
    </Location>