[allura] 13/16: Update favicon.ico and use it in docker; avoids 404 which disrupts session esp. multifactor login

[br...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch db/8378
in repository https://gitbox.apache.org/repos/asf/allura.git

commit 54434ecc7c89f935687ae1c1bf9225b4ad647665
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Fri Oct 9 17:51:04 2020 -0400

    Update favicon.ico and use it in docker; avoids 404 which disrupts session esp. multifactor login
---
 Allura/allura/public/nf/favicon.ico | Bin 1104 -> 1150 bytes
 scm_config/git-http/git-http.conf   |   2 ++
 scripts/init-docker-dev.sh          |   1 +
 3 files changed, 3 insertions(+)

diff --git a/Allura/allura/public/nf/favicon.ico b/Allura/allura/public/nf/favicon.ico
index 840986e..3d0019d 100644
Binary files a/Allura/allura/public/nf/favicon.ico and b/Allura/allura/public/nf/favicon.ico differ
diff --git a/scm_config/git-http/git-http.conf b/scm_config/git-http/git-http.conf
index bee3882..38639d6 100644
--- a/scm_config/git-http/git-http.conf
+++ b/scm_config/git-http/git-http.conf
@@ -35,6 +35,7 @@ ErrorLog /dev/stderr
 
     # any Alias here must be excluded from ProxyPass (at bottom of file)
     Alias /robots.txt /allura-data/www-misc/robots.txt
+    Alias /favicon.ico /allura-data/www-misc/favicon.ico
     <Directory /allura-data/www-misc/>
         Require all granted
     </Directory>
@@ -58,6 +59,7 @@ ErrorLog /dev/stderr
 
     # declare what is being handled here
     ProxyPass "/robots.txt" !
+    ProxyPass "/favicon.ico" !
     ProxyPass "/git/" !
     # everything else gets proxied through to the Allura webapp
     ProxyPass "/" "http://web:8088/"
diff --git a/scripts/init-docker-dev.sh b/scripts/init-docker-dev.sh
index f8dc856..2f718c9 100755
--- a/scripts/init-docker-dev.sh
+++ b/scripts/init-docker-dev.sh
@@ -34,6 +34,7 @@ chmod 777 /allura-data/solr
 
 mkdir -p /allura-data/www-misc
 echo "# No robots.txt rules here" > /allura-data/www-misc/robots.txt
+cp /allura/Allura/allura/public/nf/favicon.ico /allura-data/www-misc/favicon.ico
 
 # share venv to allow update and sharing across containers
 if [ ! -e /allura-data/virtualenv ]; then