Merge pull request #1043 from aaronwmorris/dev

aaronwmorris · web-flow · commit 7f8348a56912 · 2023-11-26T13:29:05.000-06:00
add favicon link
diff --git a/docker/apache.local.conf b/docker/apache.local.conf
@@ -582,42 +582,7 @@ SSLRandomSeed connect builtin
     ExpiresActive On
     ExpiresByType application/javascript "access plus 1 days"
     ExpiresByType text/css "access plus 1 days"
-    ExpiresByType image/jpg "access plus 90 days"
-    ExpiresByType image/jpeg "access plus 90 days"
-    ExpiresByType image/png "access plus 90 days"
-    ExpiresByType image/tiff "access plus 90 days"
-    ExpiresByType image/webp "access plus 90 days"
-    ExpiresByType image/x-jp2 "access plus 90 days"
-    ExpiresByType video/mp4 "access plus 90 days"
-    ExpiresByType video/webm "access plus 90 days"
-
-
-    <Directory /home/allsky/indi-allsky>
-        Require all granted
-        Options -Indexes
-    </Directory>
-
-    <Directory %INDIALLSKY_IMAGE_FOLDER%>
-        Require all granted
-        Options -Indexes
-    </Directory>
-
-
-    Alias /indi-allsky/images %INDIALLSKY_IMAGE_FOLDER%
-    Alias /indi-allsky/static /home/allsky/indi-allsky/indi_allsky/flask/static
-
-    ProxyPreserveHost On
-    ProxyPass /indi-allsky/static !
-    ProxyPass /indi-allsky/images !
-    ProxyPass /indi-allsky http://gunicorn.indi.allsky:8000/indi-allsky
-    ProxyPassReverse /indi-allsky http://gunicorn.indi.allsky:8000/indi-allsky
-    ProxyTimeout 180
-
-    RequestHeader set X-Forwarded-Proto expr=%{REQUEST_SCHEME}
-    RequestHeader set X-Forwarded-SSL expr=%{HTTPS}
-
-
-    ExpiresActive On
+    ExpiresByType image/x-icon "access plus 1 days"
     ExpiresByType image/jpg "access plus 90 days"
     ExpiresByType image/jpeg "access plus 90 days"
     ExpiresByType image/png "access plus 90 days"
diff --git a/indi_allsky/flask/templates/base.html b/indi_allsky/flask/templates/base.html
@@ -2,6 +2,7 @@
 <html>
   <head>
 <title>{% block title %}{% endblock %}</title>
+<link rel="shortcut icon" href="favicon.ico">
 <link href="{{ url_for('indi_allsky.static', filename='css/bootstrap.min.css') }}" rel="stylesheet">
 <link href="{{ url_for('indi_allsky.static', filename='css/style.css') }}" rel="stylesheet">
 <script src="{{ url_for('indi_allsky.static', filename='js/jquery-3.6.3.min.js') }}"></script>
diff --git a/service/apache_indi-allsky.conf b/service/apache_indi-allsky.conf
@@ -26,6 +26,7 @@ Listen *:%HTTPS_PORT%
     ExpiresActive On
     ExpiresByType application/javascript "access plus 1 days"
     ExpiresByType text/css "access plus 1 days"
+    ExpiresByType image/x-icon "access plus 1 days"
     ExpiresByType image/jpg "access plus 90 days"
     ExpiresByType image/jpeg "access plus 90 days"
     ExpiresByType image/png "access plus 90 days"
@@ -71,6 +72,9 @@ Listen *:%HTTPS_PORT%
 
 
     ExpiresActive On
+    ExpiresByType application/javascript "access plus 1 days"
+    ExpiresByType text/css "access plus 1 days"
+    ExpiresByType image/x-icon "access plus 1 days"
     ExpiresByType image/jpg "access plus 90 days"
     ExpiresByType image/jpeg "access plus 90 days"
     ExpiresByType image/png "access plus 90 days"
