From 0a0be6cdf8c969bfdf94e7bc61c8b93ca055b1ff Mon Sep 17 00:00:00 2001 From: VC Date: Tue, 8 Sep 2020 11:20:42 +0200 Subject: [PATCH] Plein de modif des vacances \o/ --- roles/nginx/templates/header.conf.j2 | 4 ++-- roles/nginx/templates/nginx.conf.j2 | 8 ++------ .../templates/vhosts/mm.pipoworld.fr.conf.j2 | 4 ++-- roles/nginx/templates/vhosts/r.mateu.be.conf.j2 | 4 ++-- .../nginx/templates/vhosts/www.intendo.fr.conf.j2 | 4 ++-- .../templates/vhosts/www.nintendojo.fr.conf.j2 | 4 ++-- .../nginx/templates/vhosts/z.libertus.eu.conf.j2 | 4 ++-- roles/spamassassin/files/local.cf | 15 +++++++++++++++ 8 files changed, 29 insertions(+), 18 deletions(-) diff --git a/roles/nginx/templates/header.conf.j2 b/roles/nginx/templates/header.conf.j2 index ec5f855..60b1420 100644 --- a/roles/nginx/templates/header.conf.j2 +++ b/roles/nginx/templates/header.conf.j2 @@ -4,7 +4,7 @@ ssl_certificate /etc/x509/{{ item }}/fullchain.cer; ssl_certificate_key /etc/x509/{{ item }}/{{ item }}.key; server_name {{ item }}; - access_log /var/log/nginx/{{ item }}.access.log combined_port; - access_log syslog:server=unix:/dev/log combined_port; + access_log /var/log/nginx/{{ item }}.access.log combined; + access_log syslog:server=unix:/dev/log combined; error_log /var/log/nginx/{{ item }}.error.log; error_log syslog:server=unix:/dev/log; diff --git a/roles/nginx/templates/nginx.conf.j2 b/roles/nginx/templates/nginx.conf.j2 index fa12fcc..8d7152d 100644 --- a/roles/nginx/templates/nginx.conf.j2 +++ b/roles/nginx/templates/nginx.conf.j2 @@ -34,12 +34,8 @@ http { ## # Logging Settings ## - log_format combined_port - '$remote_addr:$remote_port - $remote_user [$time_local] ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent"'; - access_log /var/log/nginx/access.log combined_port; - access_log syslog:server=unix:/dev/log combined_port; + access_log /var/log/nginx/access.log combined; + access_log syslog:server=unix:/dev/log combined; error_log /var/log/nginx/error.log; error_log syslog:server=unix:/dev/log; diff --git a/roles/nginx/templates/vhosts/mm.pipoworld.fr.conf.j2 b/roles/nginx/templates/vhosts/mm.pipoworld.fr.conf.j2 index 17549e2..e29b11d 100644 --- a/roles/nginx/templates/vhosts/mm.pipoworld.fr.conf.j2 +++ b/roles/nginx/templates/vhosts/mm.pipoworld.fr.conf.j2 @@ -4,8 +4,8 @@ server { ssl_certificate /etc/x509/mm.pipoworld.fr/fullchain.cer; ssl_certificate_key /etc/x509/mm.pipoworld.fr/mm.pipoworld.fr.key; server_name mm.pipoworld.fr mm.nintendojo.fr; - access_log /var/log/nginx/mm.pipoworld.fr.access.log combined_port; - access_log syslog:server=unix:/dev/log combined_port; + access_log /var/log/nginx/mm.pipoworld.fr.access.log combined; + access_log syslog:server=unix:/dev/log combined; error_log /var/log/nginx/mm.pipoworld.fr.error.log; error_log syslog:server=unix:/dev/log; diff --git a/roles/nginx/templates/vhosts/r.mateu.be.conf.j2 b/roles/nginx/templates/vhosts/r.mateu.be.conf.j2 index 7932106..b0ad81c 100644 --- a/roles/nginx/templates/vhosts/r.mateu.be.conf.j2 +++ b/roles/nginx/templates/vhosts/r.mateu.be.conf.j2 @@ -3,8 +3,8 @@ server { listen [::]:443 ssl http2; server_name r.mateu.be perso.nintendojo.fr perso.libertus.eu; - access_log /var/log/nginx/r.mateu.be.access.log combined_port; - access_log syslog:server=unix:/dev/log combined_port; + access_log /var/log/nginx/r.mateu.be.access.log combined; + access_log syslog:server=unix:/dev/log combined; error_log /var/log/nginx/r.mateu.be.error.log; error_log syslog:server=unix:/dev/log; ssl_certificate /etc/x509/r.mateu.be/fullchain.cer; diff --git a/roles/nginx/templates/vhosts/www.intendo.fr.conf.j2 b/roles/nginx/templates/vhosts/www.intendo.fr.conf.j2 index 8fd39d2..8ccb91f 100644 --- a/roles/nginx/templates/vhosts/www.intendo.fr.conf.j2 +++ b/roles/nginx/templates/vhosts/www.intendo.fr.conf.j2 @@ -4,8 +4,8 @@ server { ssl_certificate /etc/x509/intendo.fr/fullchain.cer; ssl_certificate_key /etc/x509/intendo.fr/intendo.fr.key; server_name intendo.fr www.intendo.fr; - access_log /var/log/intendo.fr.access.log combined_port; - access_log syslog:server=unix:/dev/log combined_port; + access_log /var/log/intendo.fr.access.log combined; + access_log syslog:server=unix:/dev/log combined; error_log /var/log/intendo.fr.error.log; error_log syslog:server=unix:/dev/log; diff --git a/roles/nginx/templates/vhosts/www.nintendojo.fr.conf.j2 b/roles/nginx/templates/vhosts/www.nintendojo.fr.conf.j2 index 5405822..4ca3a40 100644 --- a/roles/nginx/templates/vhosts/www.nintendojo.fr.conf.j2 +++ b/roles/nginx/templates/vhosts/www.nintendojo.fr.conf.j2 @@ -3,8 +3,8 @@ server { listen *:443 ssl http2; listen [::]:443 ssl http2; server_name nintendojo.fr www.nintendojo.fr; - access_log /var/log/nginx/nintendojo.fr.access.log combined_port; - access_log syslog:server=unix:/dev/log combined_port; + access_log /var/log/nginx/nintendojo.fr.access.log combined; + access_log syslog:server=unix:/dev/log combined; error_log /var/log/nginx/nintendojo.fr.error.log; error_log syslog:server=unix:/dev/log; ssl_certificate /etc/x509/www.nintendojo.fr/fullchain.cer; diff --git a/roles/nginx/templates/vhosts/z.libertus.eu.conf.j2 b/roles/nginx/templates/vhosts/z.libertus.eu.conf.j2 index f815475..f182d22 100644 --- a/roles/nginx/templates/vhosts/z.libertus.eu.conf.j2 +++ b/roles/nginx/templates/vhosts/z.libertus.eu.conf.j2 @@ -3,8 +3,8 @@ server { listen [::]:443 ssl http2; server_name z.libertus.eu autodiscover.libertus.eu; - access_log /var/log/nginx/z.libertus.eu.access.log combined_port; - access_log syslog:server=unix:/dev/log combined_port; + access_log /var/log/nginx/z.libertus.eu.access.log combined; + access_log syslog:server=unix:/dev/log combined; error_log /var/log/nginx/z.libertus.eu.error.log; error_log syslog:server=unix:/dev/log; diff --git a/roles/spamassassin/files/local.cf b/roles/spamassassin/files/local.cf index 795e9c3..a46e931 100644 --- a/roles/spamassassin/files/local.cf +++ b/roles/spamassassin/files/local.cf @@ -6,6 +6,12 @@ bayes_auto_learn 1 ok_locales fr score UNWANTED_LANGUAGE_BODY 5 +header LOCAL_CARESSE Subject =~ /caresse/i +score LOCAL_CARESSE 3.0 + +header LOCAL_CETOSE Subject =~ /cétose/i +score LOCAL_CETOSE 5.0 + header LOCAL_SPONSO Subject =~ /sponsoris/i score LOCAL_SPONSO 10.0 @@ -24,6 +30,9 @@ score LOCAL_AGRAND_PENIS 50.0 rawbody LOCAL_NO_CASINO /casino review/i score LOCAL_NO_CASINO 5.0 +rawbody LOCAL_MLTRK /mltrk\.io/i +score LOCAL_MLTRK 5.0 + header LOCAL_PROFIT Subject =~ /profit opportunity/i score LOCAL_PROFIT 10.0 @@ -82,6 +91,12 @@ score LOCAL_BITCOIN 10.0 whitelist_from *@chichiclothing.com # Blacklist manuel +blacklist_from *@affgalaxy.com +blacklist_from *@olabizer.de +blacklist_from *@bizetase.nl +blacklist_from *@namagesy.nl +blacklist_from *@axesrtym.de +blacklist_from *@ferizerds.de blacklist_from *@*.email blacklist_from *@namagesy.de blacklist_from *@dezinoke.de