Relates to https://github.com/shaarli/Shaarli/issues/681
Changed:
- nginx+php-fpm: set maximum upload size to 10 MiB
See:
- https://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size
- https://secure.php.net/manual/en/ini.core.php#ini.post-max-size
- https://secure.php.net/manual/en/ini.core.php#ini.upload-max-filesize
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
- archives contain a `Shaarli` directory, itself containing sources + dependencies
- the tarball is now gzipped
- Minor code cleanup: PHPDoc, spelling, unused variables, etc.
- archives contain a `Shaarli` directory, itself containing sources + dependencies
- the tarball is now gzipped
- Minor code cleanup: PHPDoc, spelling, unused variables, etc.
+- Docker: explicitly set the maximum file upload size to 10 MiB
### Fixed
- Fix the server `<self>` value in Atom/RSS feeds
### Fixed
- Fix the server `<self>` value in Atom/RSS feeds
- Tools: only display parameter description when it exists
- archive.org: do not propose archival of private notes
- Use absolute URL for hashtags in RSS and ATOM feeds
- Tools: only display parameter description when it exists
- archive.org: do not propose archival of private notes
- Use absolute URL for hashtags in RSS and ATOM feeds
+- Docker: specify the location of the favicon
### Security
- Allow whitelisting trusted IPs, else continue banning clients upon login failure
### Security
- Allow whitelisting trusted IPs, else continue banning clients upon login failure
+RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini
+RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini
COPY nginx.conf /etc/nginx/nginx.conf
COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
COPY nginx.conf /etc/nginx/nginx.conf
COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
default_type application/octet-stream;
keepalive_timeout 20;
default_type application/octet-stream;
keepalive_timeout 20;
+ client_max_body_size 10m;
+
index index.html index.php;
server {
index index.html index.php;
server {
supervisor \
&& apt-get clean
supervisor \
&& apt-get clean
+RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini
+RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini
COPY nginx.conf /etc/nginx/nginx.conf
COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
COPY nginx.conf /etc/nginx/nginx.conf
COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
default_type application/octet-stream;
keepalive_timeout 20;
default_type application/octet-stream;
keepalive_timeout 20;
+ client_max_body_size 10m;
+
index index.html index.php;
server {
index index.html index.php;
server {
supervisor \
&& apt-get clean
supervisor \
&& apt-get clean
+RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini
+RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini
COPY nginx.conf /etc/nginx/nginx.conf
COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
COPY nginx.conf /etc/nginx/nginx.conf
COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
default_type application/octet-stream;
keepalive_timeout 20;
default_type application/octet-stream;
keepalive_timeout 20;
+ client_max_body_size 10m;
+
index index.html index.php;
server {
index index.html index.php;
server {