saving uncommitted changes in /etc prior to dnf run
This commit is contained in:
@@ -534,6 +534,7 @@ maybe chmod 0644 'dnf/vars/contentdir'
|
|||||||
maybe chmod 0644 'dnf/vars/infra'
|
maybe chmod 0644 'dnf/vars/infra'
|
||||||
maybe chmod 0644 'dnf/vars/stream'
|
maybe chmod 0644 'dnf/vars/stream'
|
||||||
maybe chmod 0755 'docker'
|
maybe chmod 0755 'docker'
|
||||||
|
maybe chmod 0640 'docker/daemon.json'
|
||||||
maybe chmod 0600 'docker/key.json'
|
maybe chmod 0600 'docker/key.json'
|
||||||
maybe chmod 0755 'dovecot'
|
maybe chmod 0755 'dovecot'
|
||||||
maybe chmod 0755 'dovecot/conf.d'
|
maybe chmod 0755 'dovecot/conf.d'
|
||||||
@@ -4926,6 +4927,7 @@ maybe chmod 0644 'rspamd/worker-proxy.inc'
|
|||||||
maybe chmod 0644 'rsyslog.conf'
|
maybe chmod 0644 'rsyslog.conf'
|
||||||
maybe chmod 0755 'rsyslog.d'
|
maybe chmod 0755 'rsyslog.d'
|
||||||
maybe chmod 0640 'rsyslog.d/00-backup.conf'
|
maybe chmod 0640 'rsyslog.d/00-backup.conf'
|
||||||
|
maybe chmod 0640 'rsyslog.d/docker.conf'
|
||||||
maybe chmod 0640 'rsyslog.d/filecreatemode.conf'
|
maybe chmod 0640 'rsyslog.d/filecreatemode.conf'
|
||||||
maybe chmod 0644 'rsyslog.d/ignore-systemd-session-slice.conf'
|
maybe chmod 0644 'rsyslog.d/ignore-systemd-session-slice.conf'
|
||||||
maybe chown 'rundeck' 'rundeck'
|
maybe chown 'rundeck' 'rundeck'
|
||||||
|
|||||||
@@ -142,7 +142,7 @@ TCP_IN = "20,21,22,25,26,53,80,88,110,143,443,465,587,873,904,953,992,993,995,19
|
|||||||
TCP_OUT = "1:65535"
|
TCP_OUT = "1:65535"
|
||||||
|
|
||||||
# Allow incoming UDP ports
|
# Allow incoming UDP ports
|
||||||
UDP_IN = "20,21,53,67,68,123,161,500,514,517,518,1194,1514,1701,1981,4500,33434:33523"
|
UDP_IN = "20,21,53,67,68,123,161,500,514,517,518,1027,1194,1514,1701,1981,4500,33434:33523"
|
||||||
|
|
||||||
# Allow outgoing UDP ports
|
# Allow outgoing UDP ports
|
||||||
# To allow outgoing traceroute add 33434:33523 to this list
|
# To allow outgoing traceroute add 33434:33523 to this list
|
||||||
|
|||||||
@@ -33,3 +33,4 @@
|
|||||||
84.117.190.166
|
84.117.190.166
|
||||||
|
|
||||||
;; connection timed out; no servers could be reached
|
;; connection timed out; no servers could be reached
|
||||||
|
188.25.145.85
|
||||||
|
|||||||
8
docker/daemon.json
Normal file
8
docker/daemon.json
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"selinux-enabled": false,
|
||||||
|
"log-driver": "syslog",
|
||||||
|
"log-opts": {
|
||||||
|
"syslog-address": "unixgram:///dev/log",
|
||||||
|
"tag": "docker/{{.Name}}"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,10 +16,10 @@ smtp_enforced_tls unix - - n - - smtp
|
|||||||
-o syslog_name=enforced-tls-smtp
|
-o syslog_name=enforced-tls-smtp
|
||||||
#-o smtp_delivery_status_filter=pcre:/etc/postfix/smtp_dsn_filter
|
#-o smtp_delivery_status_filter=pcre:/etc/postfix/smtp_dsn_filter
|
||||||
|
|
||||||
#smtp inet n - n - - smtpd
|
smtp inet n - n - - smtpd
|
||||||
# #-o content_filter=spamcheck:dummy
|
#-o content_filter=spamcheck:dummy
|
||||||
# -o receive_override_options=no_address_mappings
|
-o receive_override_options=no_address_mappings
|
||||||
# #-o content_filter=spamfilter:dummy
|
#-o content_filter=spamfilter:dummy
|
||||||
|
|
||||||
26 inet n - n - - smtpd
|
26 inet n - n - - smtpd
|
||||||
-o smtpd_tls_wrappermode=yes
|
-o smtpd_tls_wrappermode=yes
|
||||||
|
|||||||
22
rsyslog.d/docker.conf
Normal file
22
rsyslog.d/docker.conf
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
$FileCreateMode 0644
|
||||||
|
$template DockerDaemonLogFileName,"/var/log/docker/docker.log"
|
||||||
|
$template DockerContainerLogFileName,"/var/log/docker/%SYSLOGTAG:R,ERE,1,FIELD:docker/(.*)\[--end:secpath-replace%.log"
|
||||||
|
|
||||||
|
if $programname == 'dockerd' then {
|
||||||
|
?DockerDaemonLogFileName
|
||||||
|
stop
|
||||||
|
}
|
||||||
|
|
||||||
|
if $programname == 'containerd' then {
|
||||||
|
?DockerDaemonLogFileName
|
||||||
|
stop
|
||||||
|
}
|
||||||
|
|
||||||
|
if $programname == 'docker' then {
|
||||||
|
if $syslogtag contains 'docker/' then {
|
||||||
|
?DockerContainerLogFileName
|
||||||
|
stop
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$FileCreateMode 0600
|
||||||
|
|
||||||
Reference in New Issue
Block a user