aboutsummaryrefslogtreecommitdiffhomepage
path: root/docker/production
diff options
context:
space:
mode:
Diffstat (limited to 'docker/production')
-rw-r--r--docker/production/nginx.conf5
-rw-r--r--docker/production/stable/nginx.conf5
2 files changed, 10 insertions, 0 deletions
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;