X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=apache-conf.conf;h=2eb0caeff2e987967d68cc91507578c5a485aa25;hb=2a86de01949110d5f64e38ca2f95e83d16555874;hp=3406de13e4fad1a1ba9cec0fa06b625727dea8bc;hpb=b0f108eb4600f42fe3391acbe86381ce0c2d4681;p=ndwebbie.git

diff --git a/apache-conf.conf b/apache-conf.conf
index 3406de1..2eb0cae 100644
--- a/apache-conf.conf
+++ b/apache-conf.conf
@@ -55,7 +55,7 @@
 	ErrorLog logs/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 logs/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.
     #
@@ -95,38 +101,17 @@
         #
         AllowOverride None
     </Directory>
-    <Location />
+	<Location />
 
 	AuthName "NewDawn authentication"
 	AuthType basic
 
-	Auth_PG_host localhost
-	Auth_PG_user ndawn
-	Auth_PG_pwd Ni7ueYae
-	Auth_PG_database ndawn
-	Auth_PG_hash_type MD5
-
-	Auth_PG_pwd_table users
-	Auth_PG_uid_field username
-	Auth_PG_pwd_field password
-
-	Auth_PG_grp_table usersingroup
-	Auth_PG_grp_group_field groupname
-	Auth_PG_grp_user_field username
-
-	#Auth_PG_log_table access_log
-	#Auth_PG_log_uname_field login
-	#Auth_PG_log_date_field date
-	#Auth_PG_log_uri_field request
-	#Auth_PG_log_addrs_field  ip_address
+	PerlAuthenHandler NDWeb::AuthHandler
 
-        #
-        # Controls who can get stuff from this server.
-        #
-        Order Deny,Allow
+	Order Deny,Allow
 	Require valid-user
 
-    </Location>
+	</Location>
 
 
     # Disallow browsing of Subversion working copy administrative dirs.  
@@ -139,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>