Only run password trigger when password is changed

[ndwebbie.git] / apache-conf.conf

diff --git a/apache-conf.conf b/apache-conf.conf
index b4c627d211b135c86c448fc9e0313aff54fd5462..f8d0a60dbc0b89c61b56931b80d01004aee13419 100644 (file)
--- a/apache-conf.conf
+++ b/apache-conf.conf
@@ -20,12 +20,12 @@
        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
+       Alias /favicon.ico /var/www/ndawn/root/static/favicon.ico
 
        FastCgiExternalServer /tmp/ndwebpub.fcgi -socket /tmp/ndweb.socket
        Alias / /tmp/ndwebpub.fcgi/
@@ -78,7 +78,7 @@ NameVirtualHost *:443
        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,8 +93,8 @@ 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
+       Alias /favicon.ico /var/www/ndawn/root/static/favicon.ico
 
        FastCgiExternalServer /tmp/ndweb.fcgi -socket /tmp/ndweb.socket
        Alias / /tmp/ndweb.fcgi/
@@ -112,6 +112,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