Merge branch 'master' of ruin.nu:git/ndwebbie

[ndwebbie.git] / apache-conf.conf

diff --git a/apache-conf.conf b/apache-conf.conf
index 6d7738b5ab2a64f4fd2c8cae1ba847e7335cb856..167819fcaf538059ac1c288e932797f6a544e8ae 100644 (file)
--- a/apache-conf.conf
+++ b/apache-conf.conf
@@ -52,10 +52,10 @@
        ServerName nd.ruin.nu
        ServerAlias webbie.ndawn.com
 
-       ErrorLog logs/ndawn_error_log
+       ErrorLog /var/log/apache2/ndawn_error_log
        <IfModule mod_log_config.c>
                #TransferLog logs/ndawn_access_log
-               CustomLog logs/ndawn_access_log "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
+               CustomLog /var/log/apache2/ndawn_access_log "%h %l %u [%{%F %H:%M:%S}t] \"%r\" %>s %b %T \"%{Referer}i\" \"%{User-Agent}i\""
        </IfModule>
 
        <IfModule mod_setenvif.c>
@@ -69,6 +69,12 @@
     #
     DocumentRoot "/var/www/ndawn/htdocs"
 
+       DeflateFilterNote ratio
+       AddOutputFilterByType DEFLATE text/*
+       AddOutputFilterByType DEFLATE application/xhtml+xml
+       AddOutputFilterByType DEFLATE application/ms* application/vnd* application/postscript
+
+
     #
     # This should be changed to whatever you set DocumentRoot to.
     #
@@ -100,7 +106,7 @@
        AuthName "NewDawn authentication"
        AuthType basic
 
-       PerlAuthenHandler ND::Web::AuthHandler
+       PerlAuthenHandler NDWeb::AuthHandler
 
        Order Deny,Allow
        Require valid-user
@@ -118,9 +124,9 @@
        Deny from all  
     </Location>
 
-       PerlSwitches -T -I/var/www/ndawn/code/
-       PerlRequire /var/www/ndawn/code/startup.pl
-       <Location ~ "^/\w*(.*\.(pl|php|pm))?$">
+       PerlSwitches -T -I/var/www/ndawn/
+       PerlRequire /var/www/ndawn/startup.pl
+       <Location ~ "^/((\w+\.(pl|php|pm))|[^.]*)$">
                SetHandler perl-script
                PerlResponseHandler ND
        </Location>