diff --git a/.gitignore b/.gitignore index b945f8cf..798d9603 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ data/conf/rspamd/local.d/* data/conf/rspamd/override.d/* !data/conf/nginx/dynmaps.conf !data/conf/nginx/site.conf +!data/conf/nginx/meta_exporter.conf data/conf/nginx/*.conf data/conf/nginx/*.custom data/conf/nginx/*.bak diff --git a/data/conf/nginx/meta_exporter.conf b/data/conf/nginx/meta_exporter.conf new file mode 100644 index 00000000..30369a32 --- /dev/null +++ b/data/conf/nginx/meta_exporter.conf @@ -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; + } +} diff --git a/data/web/inc/functions.quarantaine.inc.php b/data/web/inc/functions.quarantaine.inc.php index 4b9e6b00..9b55e4e7 100644 --- a/data/web/inc/functions.quarantaine.inc.php +++ b/data/web/inc/functions.quarantaine.inc.php @@ -151,7 +151,7 @@ function quarantaine($_action, $_data = null) { ) ); if (!empty(gethostbynamel('postfix-mailcow'))) { - $postfix = 'apostfix-mailcow'; + $postfix = 'postfix-mailcow'; } if (!empty(gethostbynamel('postfix'))) { $postfix = 'postfix'; diff --git a/docker-compose.yml b/docker-compose.yml index 948ef8d8..ad0e9da6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -100,6 +100,7 @@ services: - ./data/web:/web:rw - ./data/conf/rspamd/dynmaps:/dynmaps:ro - dkim-vol-1:/data/dkim + - ./data/conf/rspamd/meta_exporter:/meta_exporter:ro environment: - TZ=${TZ} - DBNAME=${DBNAME} @@ -238,6 +239,7 @@ services: - ./data/conf/rspamd/dynmaps:/dynmaps:ro - ./data/assets/ssl/:/etc/ssl/mail/:ro - ./data/conf/nginx/:/etc/nginx/conf.d/:rw + - ./data/conf/rspamd/meta_exporter:/meta_exporter:ro ports: - "${HTTPS_BIND:-0.0.0.0}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}" - "${HTTP_BIND:-0.0.0.0}:${HTTP_PORT:-80}:${HTTP_PORT:-80}"