Docker: set favicon location in nginx configuration

Relates to https://github.com/shaarli/Shaarli/issues/681

Fixed:
- nginx: set the favicon location

See http://serverfault.com/a/352861

Signed-off-by: VirtualTam <virtualtam@flibidi.net>

diff --git a/docker/development/nginx.conf b/docker/development/nginx.conf
index cda09b565028b0ad39400b3d715d03789e989250..e714ee76a39e05811304facd3007ba7b54adc42d 100644 (file)
--- a/docker/development/nginx.conf
+++ b/docker/development/nginx.conf
@@ -49,6 +49,11 @@ http {
             add_header Cache-Control "public, must-revalidate, proxy-revalidate";
         }
 
+        location = /favicon.ico {
+            # serve the Shaarli favicon from its custom location
+            alias /var/www/shaarli/images/favicon.ico;
+        }
+
         location ~ (index)\.php$ {
             # filter and proxy PHP requests to PHP-FPM
             fastcgi_pass   unix:/var/run/php5-fpm.sock;

diff --git a/docker/production/nginx.conf b/docker/production/nginx.conf
index e23c4587da122c790f26c6893838280c39b03908..f7d59fc88c479ccfb58c44c6634b5aa9d09b937e 100644 (file)
--- a/docker/production/nginx.conf
+++ b/docker/production/nginx.conf
@@ -41,6 +41,11 @@ http {
             add_header Cache-Control "public, must-revalidate, proxy-revalidate";
         }
 
+        location = /favicon.ico {
+            # serve the Shaarli favicon from its custom location
+            alias /var/www/shaarli/images/favicon.ico;
+        }
+
         location ~ (index)\.php$ {
             # filter and proxy PHP requests to PHP-FPM
             fastcgi_pass   unix:/var/run/php5-fpm.sock;

diff --git a/docker/production/stable/nginx.conf b/docker/production/stable/nginx.conf
index e23c4587da122c790f26c6893838280c39b03908..f7d59fc88c479ccfb58c44c6634b5aa9d09b937e 100644 (file)
--- a/docker/production/stable/nginx.conf
+++ b/docker/production/stable/nginx.conf
@@ -41,6 +41,11 @@ http {
             add_header Cache-Control "public, must-revalidate, proxy-revalidate";
         }
 
+        location = /favicon.ico {
+            # serve the Shaarli favicon from its custom location
+            alias /var/www/shaarli/images/favicon.ico;
+        }
+
         location ~ (index)\.php$ {
             # filter and proxy PHP requests to PHP-FPM
             fastcgi_pass   unix:/var/run/php5-fpm.sock;