Replaced intelquery function with a view

[ndwebbie.git] / apache-conf.conf

diff --git a/apache-conf.conf b/apache-conf.conf
index 521331101c7abb25ef509b531fc5fc1c85173bba..f00ba42c257f8e7f5df8cc3feb2d5b3b0d39bab8 100644 (file)
--- a/apache-conf.conf
+++ b/apache-conf.conf
@@ -15,16 +15,15 @@
 
 <VirtualHost *:80>
        ServerName nd.ruin.nu
-       ServerName ndtest.ruin.nu
+       ServerAlias ndtest.ruin.nu
 
        ErrorLog /var/log/apache2/ndawn_error_log
        <IfModule mod_log_config.c>
                #TransferLog logs/ndawn_access_log
-               CustomLog /var/log/apache2/ndawn_access_log "%h %l %u [%{%F %H:%M:%S}t] \"%r\" %>s %b %T \"%{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\" PUB"
        </IfModule>
 
        Alias /static /var/www/ndawn/root/static
-       Alias /favicon.ico /var/www/ndawn/root/favicon.ico
        Alias /robots.txt /var/www/ndawn/root/robots.txt
 
        FastCgiExternalServer /tmp/ndwebpub.fcgi -socket /tmp/ndweb.socket
@@ -73,12 +72,12 @@ NameVirtualHost *:443
 
 <VirtualHost *:443>
        ServerName nd.ruin.nu
-       ServerName ndtest.ruin.nu
+       ServerAlias ndtest.ruin.nu
 
        ErrorLog /var/log/apache2/ndawn_error_log
        <IfModule mod_log_config.c>
                #TransferLog logs/ndawn_access_log
-               CustomLog /var/log/apache2/ndawn_access_log "%h %l %u [%{%F %H:%M:%S}t] \"%r\" %>s %b %T \"%{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\" SSL"
        </IfModule>
 
        SSLEngine on
@@ -93,7 +92,6 @@ NameVirtualHost *:443
        </IfModule>
 
        Alias /static /var/www/ndawn/root/static
-       Alias /favicon.ico /var/www/ndawn/root/favicon.ico
        Alias /robots.txt /var/www/ndawn/root/robots.txt
 
        FastCgiExternalServer /tmp/ndweb.fcgi -socket /tmp/ndweb.socket
@@ -112,6 +110,7 @@ NameVirtualHost *:443
                #ExpiresByType text/css "access plus 1 week"
                #ExpiresByType application/javascript "access plus 1 week"
                #ExpiresByType image/png "access plus 1 week"
+               Header append Cache-Control "public"
 
                AddOutputFilterByType DEFLATE text/html
                AddOutputFilterByType DEFLATE text/xml