Only run password trigger when password is changed

[ndwebbie.git] / apache-conf.conf

diff --git a/apache-conf.conf b/apache-conf.conf
index 0623fbbf6d2d2417c30eb6e775375db115d55c52..f8d0a60dbc0b89c61b56931b80d01004aee13419 100644 (file)
--- a/apache-conf.conf
+++ b/apache-conf.conf
@@ -24,8 +24,8 @@
        </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/
@@ -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