From 6c3c62f3a2ade5f056327b08722a6ca7aad8a581 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Tue, 12 Mar 2024 06:26:20 +0100 Subject: [PATCH] daily autocommit --- .etckeeper | 1 - amavis/conf.d/50-user | 80 ------------------------------------------- dovecot/dovecot.conf | 4 ++- myssl/dh2048.pem | 12 +++---- postfix/main.cf | 2 +- postfix/master.cf | 58 +++++++++++++++---------------- 6 files changed, 39 insertions(+), 118 deletions(-) delete mode 100755 amavis/conf.d/50-user diff --git a/.etckeeper b/.etckeeper index 552e94c40..f10bff97d 100755 --- a/.etckeeper +++ b/.etckeeper @@ -304,7 +304,6 @@ maybe chmod 0644 'amavis/conf.d/21-ubuntu_defaults' maybe chmod 0644 'amavis/conf.d/25-amavis_helpers' maybe chmod 0644 'amavis/conf.d/30-template_localization' maybe chmod 0644 'amavis/conf.d/40-policy_banks' -maybe chmod 0770 'amavis/conf.d/50-user' maybe chmod 0755 'amavis/en_US' maybe chmod 0644 'amavis/en_US/charset' maybe chmod 0644 'amavis/en_US/template-auto-response.txt' diff --git a/amavis/conf.d/50-user b/amavis/conf.d/50-user deleted file mode 100755 index bc8e6ff16..000000000 --- a/amavis/conf.d/50-user +++ /dev/null @@ -1,80 +0,0 @@ -use strict; - -# -# Place your configuration directives here. They will override those in -# earlier files. -# -# See /usr/share/doc/amavisd-new/ for documentation and examples of -# the directives you can use in this file -# - -## -## Die Kommunikation mit Amavis soll über einen Unix-Socket und über das AM.PDP-Prokoll erfolgen. -## amavisd-milter nimmt E-Mails von Postfix über die Milter-Schnittstelle bereit und übersetzt das Milter-Protokoll -## in das AM.PDP-Protokoll, da Amavis selbst kein Milter-Protokoll unterstützt. -## Postfix === Milter-Protokoll ===> Amavisd-Milter === AM.PDP-Protokoll ===> Amavis (und zurück) -## -$protocol = "AM.PDP"; -$unix_socketname = "/var/run/amavis/amavisd.sock"; -$inet_socket_port = undef; - - -## -## Policy-Bank für E-Mails von Mailclients -## E-Mails, die durch den Submission-Port für Mailclients in das Mailsystem gelangen, bekommen via Postfix-Option -## -o milter_macro_daemon_name=ORIGINATING eine "Markierung" mit "ORIGINATING". Amavis soll diese "Markierung" erkennen -## und in diesem Fall keine Untersuchung auf Spam durchführen. -## Lokale Absender (z.B. via mailx-Kommando) sind von der Spam-Untersuchung nicht betroffen, da Amavis sie automatisch als -## solche (Client 127.0.0.1) erkennt. -## - -$policy_bank{'ORIGINATING'} = { - originating => 1, - bypass_spam_checks_maps => [1] -}; - - -### -### Für welche Domains ist der Mailserver zuständig? -### => Datenbank befragen -### - -@local_domains_maps = ( [] ); - -@lookup_sql_dsn = ( ['DBI:mysql:database=vmail;host=127.0.0.1;port=3306', 'vmail', '5te902D733ZlK$q"D'], ); - -$sql_select_policy = 'SELECT "Y" as local, 1 as id FROM domains WHERE CONCAT("@",domain) IN (%k)'; -$sql_select_white_black_list = undef; - - -## -## DKIM-Verifizierung aktivieren -## Amavis prüft DKIM-Signaturen eingehender E-Mails (falls vorhanden). -## Ist die Signatur in Ordnung, wird der Spam-Score nach unten korrigiert. -## - -$enable_dkim_verification = 1; - -### -### Spamassassin settings -### - -### Spam-Checks aktivieren -@bypass_spam_checks_maps = (\%bypass_spam_checks, \@bypass_spam_checks_acl, \$bypass_spam_checks_re); -$sa_tag_level_deflt = -999; # Informationen zu Spam-Score ab diesem Level (hier: immer) in den Header schreiben -$sa_tag2_level_deflt = 6.2; # Ab diesem Level E-Mails als Spam markieren -$sa_kill_level_deflt = 6.9; # Ab diesem Level E-Mails nicht annehmen, sondern Aktion in "final_spam_destiny" auslösen (REJECT) - -$sa_spam_subject_tag = undef; # Kein ***SPAM*** in den Betreff schreiben, falls Spam -$spam_quarantine_to = undef; # Spam nicht in die Quarantäne verschieben -$final_spam_destiny = D_REJECT; # Aktion, wenn kill_level erreicht wurde: E-Mail nicht annehmen und REJECT auslösen - - -### -### Falls Benachrichtigungsmails an User geschickt werden sollen (z.B. bei geblockter Mail) -### - -$notify_method = 'smtp:[127.0.0.1]:25'; - -#------------ Do not modify anything below this line ------------- -1; # ensure a defined return diff --git a/dovecot/dovecot.conf b/dovecot/dovecot.conf index 31e1e3a4c..497c125b7 100644 --- a/dovecot/dovecot.conf +++ b/dovecot/dovecot.conf @@ -193,8 +193,10 @@ namespace { plugin { sieve_before = /var/vmail/sieve/global/spam-global.sieve +# sieve = /var/vmail/sieve/%d/%n/active-script.sieve + sieve_dir = /var/vmail/mailboxes/%d/%n/sieve/scripts/ sieve = /var/vmail/sieve/%d/%n/active-script.sieve - sieve_dir = /var/vmail/sieve/%d/%n/scripts +#/var/vmail/sieve/hoellein.online/mario quota = maildir:User quota quota_exceeded_message = Benutzer %u hat das Speichervolumen überschritten. / User %u has exhausted allowed storage space. diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem index f4775b3e3..e2547b6fe 100644 --- a/myssl/dh2048.pem +++ b/myssl/dh2048.pem @@ -1,8 +1,8 @@ -----BEGIN DH PARAMETERS----- -MIIBCAKCAQEAnzqldM5GwWVV952CGMT6i5TbtFebCKu5vnVIsAbkPP7nvG9qQPem -fKBPYSVFwu/IN6asgUiQVp8IFd3+N0E/iY1GfGbT57Gue1bKasws67JbDhDjxg8a -3NgukK34guBzsaa7Yab4ko4ZGJ8dWbtHlHcxCQ9vChZNhW8jZgThEDHMRI8HF9w2 -2g6yc+TaDgnIF9vuxeUmE446QEmLayx44LLthYr3G7WxdTVh4lxWMoxbELb/P8fG -6mUek/ub3BX4uNKei722WB2TbIIjwUdCnnuENJB0YyP1QTlEXpwT8so7+hsYAm+J -DJgpFA4Bu+EPWk4PpvoyGiD4adu4XA9p8wIBAg== +MIIBCAKCAQEAxBr+B4NmXI/RdyBDybacrOM0MTILaXfYbtuSmD/80arFHZJrbVqV +wk9cjIibbwQnO9OqKzlpRK5qQqvEY0x62kk3/mxfi4orIY4ozQK/GF93tNNE9Q9C +qSusheowodoGhfAhzWX2z2oKbAdlkO0K/702FaGn5hZHtdRMp73BCPQjvghcB8ZV +PjYRSDuUnWJv4RfSQ6V2cVXc4u9rqCrDKUdr5BfcfA4T0QxurEvJ79sTiedZ0EiL +GFiSEGELofkfPtXk+Qm548JIQk0nYLEJ2UKGVL9zTn3R9hBqTrS5eJVA/HoXZcOO +Il0nDuyKZZUP5Wdf9r4tlqnifrPxfVE+ewIBAg== -----END DH PARAMETERS----- diff --git a/postfix/main.cf b/postfix/main.cf index e7f45cf33..d56dc91d4 100644 --- a/postfix/main.cf +++ b/postfix/main.cf @@ -165,4 +165,4 @@ compatibility_level = 2 # SPF policy-spf_time_limit = 3600s #relayhost = [mail2.tbz-pariv.de] -#content_filter=smtp-amavis:[127.0.0.1]:10024 +content_filter=smtp-amavis:[127.0.0.1]:10024 diff --git a/postfix/master.cf b/postfix/master.cf index 01d32256a..06f1f8dfc 100644 --- a/postfix/master.cf +++ b/postfix/master.cf @@ -43,8 +43,8 @@ submission inet n - n - - smtpd ### Weitere wichtige Dienste für den Serverbetrieb ### pickup unix n - n 60 1 pickup -# -o content_filter= -# -o receive_override_options=no_header_body_checks + -o content_filter= + -o receive_override_options=no_header_body_checks cleanup unix n - n - 0 cleanup qmgr unix n - n 300 1 qmgr tlsmgr unix - - n 1000? 1 tlsmgr @@ -72,30 +72,30 @@ submission-header-cleanup unix n - n - 0 cleanup policy-spf unix - n n - - spawn user=nobody argv=/usr/bin/policyd-spf -#smtp-amavis unix - - - - 2 smtp -# -o smtp_data_done_timeout=1200 -# -o smtp_send_xforward_command=yes -# -o disable_dns_lookups=yes -# -o max_use=20 -# -o smtp_tls_security_level=none -# -#127.0.0.1:10025 inet n - - - - smtpd -# -o content_filter= -# -o local_recipient_maps= -# -o relay_recipient_maps= -# -o smtpd_restriction_classes= -# -o smtpd_delay_reject=no -# -o smtpd_client_restrictions=permit_mynetworks,reject -# -o smtpd_helo_restrictions= -# -o smtpd_sender_restrictions= -# -o smtpd_recipient_restrictions=permit_mynetworks,reject -# -o smtpd_data_restrictions=reject_unauth_pipelining -# -o smtpd_end_of_data_restrictions= -# -o mynetworks=127.0.0.0/8 -# -o smtpd_error_sleep_time=0 -# -o smtpd_soft_error_limit=1001 -# -o smtpd_hard_error_limit=1000 -# -o smtpd_client_connection_count_limit=0 -# -o smtpd_client_connection_rate_limit=0 -# -o receive_override_options=no_header_body_checks,no_unknown_recipient_checks -# -o smtpd_tls_security_level=none +smtp-amavis unix - - - - 2 smtp + -o smtp_data_done_timeout=1200 + -o smtp_send_xforward_command=yes + -o disable_dns_lookups=yes + -o max_use=20 + -o smtp_tls_security_level=none + +127.0.0.1:10025 inet n - - - - smtpd + -o content_filter= + -o local_recipient_maps= + -o relay_recipient_maps= + -o smtpd_restriction_classes= + -o smtpd_delay_reject=no + -o smtpd_client_restrictions=permit_mynetworks,reject + -o smtpd_helo_restrictions= + -o smtpd_sender_restrictions= + -o smtpd_recipient_restrictions=permit_mynetworks,reject + -o smtpd_data_restrictions=reject_unauth_pipelining + -o smtpd_end_of_data_restrictions= + -o mynetworks=127.0.0.0/8 + -o smtpd_error_sleep_time=0 + -o smtpd_soft_error_limit=1001 + -o smtpd_hard_error_limit=1000 + -o smtpd_client_connection_count_limit=0 + -o smtpd_client_connection_rate_limit=0 + -o receive_override_options=no_header_body_checks,no_unknown_recipient_checks + -o smtpd_tls_security_level=none -- 2.43.0