saving uncommitted changes in /etc prior to dnf run

This commit is contained in:
2022-06-28 13:58:08 +03:00
parent f3aa21d388
commit 8d7d57094b
5 changed files with 18 additions and 7 deletions

View File

@@ -31,6 +31,7 @@
# Saturn # Saturn
84.117.190.166 84.117.190.166
154.16.192.235
213.233.110.105
;; connection timed out; no servers could be reached
188.25.145.85 188.25.145.85

View File

@@ -417,7 +417,18 @@ postscreen_cache_map = proxy:btree:$data_directory/postscreen_cache
postscreen_dnsbl_reply_map = texthash:/etc/postfix/postscreen_dnsbl_reply postscreen_dnsbl_reply_map = texthash:/etc/postfix/postscreen_dnsbl_reply
# DKIM # 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 non_smtpd_milters = $smtpd_milters
milter_default_action = accept milter_default_action = accept
#milter_protocol = 2 #milter_protocol = 2

View File

@@ -18,7 +18,7 @@
.include "$CONFDIR/common.conf" .include "$CONFDIR/common.conf"
options { options {
pidfile = "$RUNDIR/rspamd.pid"; pidfile = "/var/run/rspamd.pid";
.include "$CONFDIR/options.inc" .include "$CONFDIR/options.inc"
.include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/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" .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc"

View File

@@ -92,12 +92,12 @@ X11UseLocalhost no
PermitTTY no PermitTTY no
PrintMotd yes PrintMotd yes
PrintLastLog yes PrintLastLog yes
#TCPKeepAlive yes TCPKeepAlive yes
#UsePrivilegeSeparation sandbox # Default for new installations. #UsePrivilegeSeparation sandbox # Default for new installations.
PermitUserEnvironment no PermitUserEnvironment no
Compression delayed Compression delayed
#ClientAliveInterval 300 ClientAliveInterval 3600
#ClientAliveCountMax 10 ClientAliveCountMax 0
UseDNS no UseDNS no
PidFile /var/run/sshd.pid PidFile /var/run/sshd.pid
MaxStartups 10:30:60 MaxStartups 10:30:60

View File

@@ -1 +0,0 @@
/usr/lib/systemd/system/rspamd.service