mirror of
https://github.com/Mailu/Mailu.git
synced 2025-02-21 19:19:39 +02:00
Use MESSAGE_SIZE_LIMIT in webmail container also
The webmail container should use the same value as the front container.
This commit is contained in:
parent
1e54d44b19
commit
a9f4fc1b3c
@ -36,10 +36,11 @@ RUN apk add --no-cache \
|
||||
&& rm /etc/nginx/http.d/default.conf \
|
||||
&& rm /etc/php7/php-fpm.d/www.conf \
|
||||
&& mkdir -p /run/nginx \
|
||||
&& mkdir -p /var/www/rainloop
|
||||
&& mkdir -p /var/www/rainloop \
|
||||
&& mkdir -p /config
|
||||
|
||||
# nginx / PHP config files
|
||||
COPY config/nginx-rainloop.conf /etc/nginx/http.d/rainloop.conf
|
||||
COPY config/nginx-rainloop.conf /config/nginx-rainloop.conf
|
||||
COPY config/php-rainloop.conf /etc/php7/php-fpm.d/rainloop.conf
|
||||
|
||||
# Rainloop login
|
||||
|
15
webmails/rainloop/config.py
Normal file
15
webmails/rainloop/config.py
Normal file
@ -0,0 +1,15 @@
|
||||
#!/usr/bin/python3
|
||||
|
||||
import os
|
||||
import logging as log
|
||||
import sys
|
||||
from socrate import system, conf
|
||||
|
||||
args = os.environ.copy()
|
||||
|
||||
log.basicConfig(stream=sys.stderr, level=args.get("LOG_LEVEL", "WARNING"))
|
||||
|
||||
# Build final configuration paths
|
||||
conf.jinja("/config/nginx-rainloop.conf", args, "/etc/nginx/http.d/rainloop.conf")
|
||||
if os.path.exists("/var/run/nginx.pid"):
|
||||
os.system("nginx -s reload")
|
@ -3,7 +3,7 @@ server {
|
||||
listen [::]:80 default_server;
|
||||
|
||||
root /var/www/rainloop;
|
||||
|
||||
|
||||
# /dev/stdout (Default), <path>, off
|
||||
access_log off;
|
||||
|
||||
@ -12,13 +12,16 @@ server {
|
||||
|
||||
index index.php;
|
||||
|
||||
# set maximum body size to configured limit
|
||||
client_max_body_size {{ MESSAGE_SIZE_LIMIT|int + 8388608 }};
|
||||
|
||||
location / {
|
||||
try_files $uri /index.php?$query_string;
|
||||
}
|
||||
|
||||
location ~ \.php$ {
|
||||
fastcgi_split_path_info ^(.+\.php)(/.*)$;
|
||||
|
||||
|
||||
fastcgi_intercept_errors on;
|
||||
fastcgi_index index.php;
|
||||
|
||||
|
@ -26,4 +26,5 @@ conf.jinja("/defaults/php.ini", os.environ, "/etc/php7/php.ini")
|
||||
os.system("chown -R nginx:nginx /data")
|
||||
os.system("chmod -R a+rX /var/www/rainloop/")
|
||||
|
||||
subprocess.call(["/config.py"])
|
||||
os.execv("/usr/sbin/nginx", ["nginx", "-g", "daemon off;"])
|
||||
|
Loading…
x
Reference in New Issue
Block a user