X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=docker%2Fdevelopment%2Fnginx.conf;h=ac0c6c61ce165976b7572bb96eb8ba90b5f4d2a8;hb=68579ad5c4d1978366c5d2be2ef34da6a3618ef0;hp=cda09b565028b0ad39400b3d715d03789e989250;hpb=66d86ea521d737b1bc92b16b9c9b4126f545916c;p=github%2Fshaarli%2FShaarli.git

diff --git a/docker/development/nginx.conf b/docker/development/nginx.conf
index cda09b56..ac0c6c61 100644
--- a/docker/development/nginx.conf
+++ b/docker/development/nginx.conf
@@ -11,6 +11,8 @@ http {
     default_type       application/octet-stream;
     keepalive_timeout  20;
 
+    client_max_body_size 10m;
+
     index index.html index.php;
 
     server {
@@ -49,6 +51,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;