Fix quarantaine

master
andre.peters 2017-12-11 09:55:22 +01:00
parent c875508687
commit ae56c3b59e
4 changed files with 23 additions and 1 deletions

1
.gitignore vendored
View File

@ -17,6 +17,7 @@ data/conf/rspamd/local.d/*
data/conf/rspamd/override.d/* data/conf/rspamd/override.d/*
!data/conf/nginx/dynmaps.conf !data/conf/nginx/dynmaps.conf
!data/conf/nginx/site.conf !data/conf/nginx/site.conf
!data/conf/nginx/meta_exporter.conf
data/conf/nginx/*.conf data/conf/nginx/*.conf
data/conf/nginx/*.custom data/conf/nginx/*.custom
data/conf/nginx/*.bak data/conf/nginx/*.bak

View File

@ -0,0 +1,19 @@
server {
listen 9081;
index index.php index.html;
server_name _;
error_log /var/log/nginx/error.log;
access_log /var/log/nginx/access.log;
root /meta_exporter;
client_max_body_size 10M;
location ~ \.php$ {
client_max_body_size 10M;
try_files $uri =404;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass phpfpm:9000;
fastcgi_index pipe.php;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
}
}

View File

@ -151,7 +151,7 @@ function quarantaine($_action, $_data = null) {
) )
); );
if (!empty(gethostbynamel('postfix-mailcow'))) { if (!empty(gethostbynamel('postfix-mailcow'))) {
$postfix = 'apostfix-mailcow'; $postfix = 'postfix-mailcow';
} }
if (!empty(gethostbynamel('postfix'))) { if (!empty(gethostbynamel('postfix'))) {
$postfix = 'postfix'; $postfix = 'postfix';

View File

@ -100,6 +100,7 @@ services:
- ./data/web:/web:rw - ./data/web:/web:rw
- ./data/conf/rspamd/dynmaps:/dynmaps:ro - ./data/conf/rspamd/dynmaps:/dynmaps:ro
- dkim-vol-1:/data/dkim - dkim-vol-1:/data/dkim
- ./data/conf/rspamd/meta_exporter:/meta_exporter:ro
environment: environment:
- TZ=${TZ} - TZ=${TZ}
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
@ -238,6 +239,7 @@ services:
- ./data/conf/rspamd/dynmaps:/dynmaps:ro - ./data/conf/rspamd/dynmaps:/dynmaps:ro
- ./data/assets/ssl/:/etc/ssl/mail/:ro - ./data/assets/ssl/:/etc/ssl/mail/:ro
- ./data/conf/nginx/:/etc/nginx/conf.d/:rw - ./data/conf/nginx/:/etc/nginx/conf.d/:rw
- ./data/conf/rspamd/meta_exporter:/meta_exporter:ro
ports: ports:
- "${HTTPS_BIND:-0.0.0.0}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}" - "${HTTPS_BIND:-0.0.0.0}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}"
- "${HTTP_BIND:-0.0.0.0}:${HTTP_PORT:-80}:${HTTP_PORT:-80}" - "${HTTP_BIND:-0.0.0.0}:${HTTP_PORT:-80}:${HTTP_PORT:-80}"