diff options
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | docker/development/Dockerfile | 2 | ||||
-rw-r--r-- | docker/development/nginx.conf | 2 | ||||
-rw-r--r-- | docker/production/Dockerfile | 2 | ||||
-rw-r--r-- | docker/production/nginx.conf | 2 | ||||
-rw-r--r-- | docker/production/stable/Dockerfile | 2 | ||||
-rw-r--r-- | docker/production/stable/nginx.conf | 2 |
7 files changed, 14 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d42d6a75..5eeb521a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). | |||
20 | - archives contain a `Shaarli` directory, itself containing sources + dependencies | 20 | - archives contain a `Shaarli` directory, itself containing sources + dependencies |
21 | - the tarball is now gzipped | 21 | - the tarball is now gzipped |
22 | - Minor code cleanup: PHPDoc, spelling, unused variables, etc. | 22 | - Minor code cleanup: PHPDoc, spelling, unused variables, etc. |
23 | - Docker: explicitly set the maximum file upload size to 10 MiB | ||
23 | 24 | ||
24 | ### Fixed | 25 | ### Fixed |
25 | - Fix the server `<self>` value in Atom/RSS feeds | 26 | - Fix the server `<self>` value in Atom/RSS feeds |
@@ -27,6 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). | |||
27 | - Tools: only display parameter description when it exists | 28 | - Tools: only display parameter description when it exists |
28 | - archive.org: do not propose archival of private notes | 29 | - archive.org: do not propose archival of private notes |
29 | - Use absolute URL for hashtags in RSS and ATOM feeds | 30 | - Use absolute URL for hashtags in RSS and ATOM feeds |
31 | - Docker: specify the location of the favicon | ||
30 | 32 | ||
31 | ### Security | 33 | ### Security |
32 | - Allow whitelisting trusted IPs, else continue banning clients upon login failure | 34 | - Allow whitelisting trusted IPs, else continue banning clients upon login failure |
diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 0c19b085..d9ef8da7 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile | |||
@@ -15,6 +15,8 @@ RUN apt-get update \ | |||
15 | nano \ | 15 | nano \ |
16 | && apt-get clean | 16 | && apt-get clean |
17 | 17 | ||
18 | RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini | ||
19 | RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini | ||
18 | COPY nginx.conf /etc/nginx/nginx.conf | 20 | COPY nginx.conf /etc/nginx/nginx.conf |
19 | COPY supervised.conf /etc/supervisor/conf.d/supervised.conf | 21 | COPY supervised.conf /etc/supervisor/conf.d/supervised.conf |
20 | 22 | ||
diff --git a/docker/development/nginx.conf b/docker/development/nginx.conf index e714ee76..ac0c6c61 100644 --- a/docker/development/nginx.conf +++ b/docker/development/nginx.conf | |||
@@ -11,6 +11,8 @@ http { | |||
11 | default_type application/octet-stream; | 11 | default_type application/octet-stream; |
12 | keepalive_timeout 20; | 12 | keepalive_timeout 20; |
13 | 13 | ||
14 | client_max_body_size 10m; | ||
15 | |||
14 | index index.html index.php; | 16 | index index.html index.php; |
15 | 17 | ||
16 | server { | 18 | server { |
diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index d93ed262..d0509115 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile | |||
@@ -14,6 +14,8 @@ RUN apt-get update \ | |||
14 | supervisor \ | 14 | supervisor \ |
15 | && apt-get clean | 15 | && apt-get clean |
16 | 16 | ||
17 | RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini | ||
18 | RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini | ||
17 | COPY nginx.conf /etc/nginx/nginx.conf | 19 | COPY nginx.conf /etc/nginx/nginx.conf |
18 | COPY supervised.conf /etc/supervisor/conf.d/supervised.conf | 20 | COPY supervised.conf /etc/supervisor/conf.d/supervised.conf |
19 | 21 | ||
diff --git a/docker/production/nginx.conf b/docker/production/nginx.conf index f7d59fc8..5ffa02d0 100644 --- a/docker/production/nginx.conf +++ b/docker/production/nginx.conf | |||
@@ -11,6 +11,8 @@ http { | |||
11 | default_type application/octet-stream; | 11 | default_type application/octet-stream; |
12 | keepalive_timeout 20; | 12 | keepalive_timeout 20; |
13 | 13 | ||
14 | client_max_body_size 10m; | ||
15 | |||
14 | index index.html index.php; | 16 | index index.html index.php; |
15 | 17 | ||
16 | server { | 18 | server { |
diff --git a/docker/production/stable/Dockerfile b/docker/production/stable/Dockerfile index a509fda6..fc9588b0 100644 --- a/docker/production/stable/Dockerfile +++ b/docker/production/stable/Dockerfile | |||
@@ -14,6 +14,8 @@ RUN apt-get update \ | |||
14 | supervisor \ | 14 | supervisor \ |
15 | && apt-get clean | 15 | && apt-get clean |
16 | 16 | ||
17 | RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini | ||
18 | RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini | ||
17 | COPY nginx.conf /etc/nginx/nginx.conf | 19 | COPY nginx.conf /etc/nginx/nginx.conf |
18 | COPY supervised.conf /etc/supervisor/conf.d/supervised.conf | 20 | COPY supervised.conf /etc/supervisor/conf.d/supervised.conf |
19 | 21 | ||
diff --git a/docker/production/stable/nginx.conf b/docker/production/stable/nginx.conf index f7d59fc8..5ffa02d0 100644 --- a/docker/production/stable/nginx.conf +++ b/docker/production/stable/nginx.conf | |||
@@ -11,6 +11,8 @@ http { | |||
11 | default_type application/octet-stream; | 11 | default_type application/octet-stream; |
12 | keepalive_timeout 20; | 12 | keepalive_timeout 20; |
13 | 13 | ||
14 | client_max_body_size 10m; | ||
15 | |||
14 | index index.html index.php; | 16 | index index.html index.php; |
15 | 17 | ||
16 | server { | 18 | server { |