From 8d7d57094b49ad080359aef09c56f835bdd4eb24 Mon Sep 17 00:00:00 2001 From: bms8197 Date: Tue, 28 Jun 2022 13:58:08 +0300 Subject: [PATCH] saving uncommitted changes in /etc prior to dnf run --- csf/csf.ignore | 3 ++- postfix/main.cf | 13 ++++++++++++- rspamd/rspamd.conf | 2 +- ssh/sshd_config | 6 +++--- .../system/multi-user.target.wants/rspamd.service | 1 - 5 files changed, 18 insertions(+), 7 deletions(-) delete mode 120000 systemd/system/multi-user.target.wants/rspamd.service diff --git a/csf/csf.ignore b/csf/csf.ignore index 664094f..e32356a 100644 --- a/csf/csf.ignore +++ b/csf/csf.ignore @@ -31,6 +31,7 @@ # Saturn 84.117.190.166 +154.16.192.235 +213.233.110.105 -;; connection timed out; no servers could be reached 188.25.145.85 diff --git a/postfix/main.cf b/postfix/main.cf index c81e5be..ae0417d 100644 --- a/postfix/main.cf +++ b/postfix/main.cf @@ -417,7 +417,18 @@ postscreen_cache_map = proxy:btree:$data_directory/postscreen_cache postscreen_dnsbl_reply_map = texthash:/etc/postfix/postscreen_dnsbl_reply # DKIM -smtpd_milters = inet:127.0.0.1:8891, inet:127.0.0.1:11332, inet:localhost:8893 +smtpd_milters = inet:127.0.0.1:8891, inet:localhost:8893 +#smtpd_milters = inet:127.0.0.1:8891, inet:127.0.0.1:11332, inet:localhost:8893 +non_smtpd_milters = $smtpd_milters +milter_default_action = accept +#milter_protocol = 2 +# if rspamd is down, don't reject mail +milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen} {auth_type} + +# amavis +#content_filter=amavisfeed:[127.0.0.1]:10024 + +#receive_override_options=no_address_mappings non_smtpd_milters = $smtpd_milters milter_default_action = accept #milter_protocol = 2 diff --git a/rspamd/rspamd.conf b/rspamd/rspamd.conf index 115fa54..73452db 100644 --- a/rspamd/rspamd.conf +++ b/rspamd/rspamd.conf @@ -18,7 +18,7 @@ .include "$CONFDIR/common.conf" options { - pidfile = "$RUNDIR/rspamd.pid"; + pidfile = "/var/run/rspamd.pid"; .include "$CONFDIR/options.inc" .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/options.inc" .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc" diff --git a/ssh/sshd_config b/ssh/sshd_config index 2f90dac..60eab6f 100644 --- a/ssh/sshd_config +++ b/ssh/sshd_config @@ -92,12 +92,12 @@ X11UseLocalhost no PermitTTY no PrintMotd yes PrintLastLog yes -#TCPKeepAlive yes +TCPKeepAlive yes #UsePrivilegeSeparation sandbox # Default for new installations. PermitUserEnvironment no Compression delayed -#ClientAliveInterval 300 -#ClientAliveCountMax 10 +ClientAliveInterval 3600 +ClientAliveCountMax 0 UseDNS no PidFile /var/run/sshd.pid MaxStartups 10:30:60 diff --git a/systemd/system/multi-user.target.wants/rspamd.service b/systemd/system/multi-user.target.wants/rspamd.service deleted file mode 120000 index 7e7942b..0000000 --- a/systemd/system/multi-user.target.wants/rspamd.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/rspamd.service \ No newline at end of file