diff options
author | VirtualTam <virtualtam@flibidi.net> | 2016-11-05 19:51:03 +0100 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2016-11-05 19:57:36 +0100 |
commit | b7f8b874bb9f2028c29b1f22f893fabec2836de8 (patch) | |
tree | 0605ea745e963161adc22a27d7df4eff7d292eba | |
parent | 849d1650c1af853162b749af896c20bb25d4a4e8 (diff) | |
download | Shaarli-b7f8b874bb9f2028c29b1f22f893fabec2836de8.tar.gz Shaarli-b7f8b874bb9f2028c29b1f22f893fabec2836de8.tar.zst Shaarli-b7f8b874bb9f2028c29b1f22f893fabec2836de8.zip |
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>
-rw-r--r-- | docker/development/nginx.conf | 5 | ||||
-rw-r--r-- | docker/production/nginx.conf | 5 | ||||
-rw-r--r-- | docker/production/stable/nginx.conf | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/docker/development/nginx.conf b/docker/development/nginx.conf index cda09b56..e714ee76 100644 --- a/docker/development/nginx.conf +++ b/docker/development/nginx.conf | |||
@@ -49,6 +49,11 @@ http { | |||
49 | add_header Cache-Control "public, must-revalidate, proxy-revalidate"; | 49 | add_header Cache-Control "public, must-revalidate, proxy-revalidate"; |
50 | } | 50 | } |
51 | 51 | ||
52 | location = /favicon.ico { | ||
53 | # serve the Shaarli favicon from its custom location | ||
54 | alias /var/www/shaarli/images/favicon.ico; | ||
55 | } | ||
56 | |||
52 | location ~ (index)\.php$ { | 57 | location ~ (index)\.php$ { |
53 | # filter and proxy PHP requests to PHP-FPM | 58 | # filter and proxy PHP requests to PHP-FPM |
54 | fastcgi_pass unix:/var/run/php5-fpm.sock; | 59 | fastcgi_pass unix:/var/run/php5-fpm.sock; |
diff --git a/docker/production/nginx.conf b/docker/production/nginx.conf index e23c4587..f7d59fc8 100644 --- a/docker/production/nginx.conf +++ b/docker/production/nginx.conf | |||
@@ -41,6 +41,11 @@ http { | |||
41 | add_header Cache-Control "public, must-revalidate, proxy-revalidate"; | 41 | add_header Cache-Control "public, must-revalidate, proxy-revalidate"; |
42 | } | 42 | } |
43 | 43 | ||
44 | location = /favicon.ico { | ||
45 | # serve the Shaarli favicon from its custom location | ||
46 | alias /var/www/shaarli/images/favicon.ico; | ||
47 | } | ||
48 | |||
44 | location ~ (index)\.php$ { | 49 | location ~ (index)\.php$ { |
45 | # filter and proxy PHP requests to PHP-FPM | 50 | # filter and proxy PHP requests to PHP-FPM |
46 | fastcgi_pass unix:/var/run/php5-fpm.sock; | 51 | fastcgi_pass unix:/var/run/php5-fpm.sock; |
diff --git a/docker/production/stable/nginx.conf b/docker/production/stable/nginx.conf index e23c4587..f7d59fc8 100644 --- a/docker/production/stable/nginx.conf +++ b/docker/production/stable/nginx.conf | |||
@@ -41,6 +41,11 @@ http { | |||
41 | add_header Cache-Control "public, must-revalidate, proxy-revalidate"; | 41 | add_header Cache-Control "public, must-revalidate, proxy-revalidate"; |
42 | } | 42 | } |
43 | 43 | ||
44 | location = /favicon.ico { | ||
45 | # serve the Shaarli favicon from its custom location | ||
46 | alias /var/www/shaarli/images/favicon.ico; | ||
47 | } | ||
48 | |||
44 | location ~ (index)\.php$ { | 49 | location ~ (index)\.php$ { |
45 | # filter and proxy PHP requests to PHP-FPM | 50 | # filter and proxy PHP requests to PHP-FPM |
46 | fastcgi_pass unix:/var/run/php5-fpm.sock; | 51 | fastcgi_pass unix:/var/run/php5-fpm.sock; |