From 5ee79666a02d807f4fdb160a96c9788cde7dc76b Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 24 Jan 2018 10:57:24 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 3 +- config-archive/etc/systemd/journald.conf | 4 +- config-archive/etc/systemd/journald.conf.1 | 40 +++++++++++++++++++ config-archive/etc/systemd/journald.conf.dist | 1 + ...olved.conf.dist.new => resolved.conf.dist} | 1 + systemd/journald.conf | 1 + systemd/network/50-static.network | 1 + systemd/resolved.conf | 4 ++ 8 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 config-archive/etc/systemd/journald.conf.1 rename config-archive/etc/systemd/{resolved.conf.dist.new => resolved.conf.dist} (97%) diff --git a/.etckeeper b/.etckeeper index 32f7caa..1763203 100755 --- a/.etckeeper +++ b/.etckeeper @@ -198,9 +198,10 @@ maybe chmod 0640 'config-archive/etc/ssmtp/ssmtp.conf' maybe chmod 0640 'config-archive/etc/ssmtp/ssmtp.conf.dist.new' maybe chmod 0755 'config-archive/etc/systemd' maybe chmod 0644 'config-archive/etc/systemd/journald.conf' +maybe chmod 0644 'config-archive/etc/systemd/journald.conf.1' maybe chmod 0644 'config-archive/etc/systemd/journald.conf.dist' maybe chmod 0644 'config-archive/etc/systemd/resolved.conf' -maybe chmod 0644 'config-archive/etc/systemd/resolved.conf.dist.new' +maybe chmod 0644 'config-archive/etc/systemd/resolved.conf.dist' maybe chmod 0755 'cron.d' maybe chmod 0644 'cron.d/.keep_sys-process_cronie-0' maybe chmod 0755 'cron.daily' diff --git a/config-archive/etc/systemd/journald.conf b/config-archive/etc/systemd/journald.conf index 2e34451..13df9e4 100644 --- a/config-archive/etc/systemd/journald.conf +++ b/config-archive/etc/systemd/journald.conf @@ -17,14 +17,16 @@ #Seal=yes #SplitMode=uid #SyncIntervalSec=5m -#RateLimitInterval=30s +#RateLimitIntervalSec=30s #RateLimitBurst=1000 #SystemMaxUse= #SystemKeepFree= #SystemMaxFileSize= +#SystemMaxFiles=100 #RuntimeMaxUse= #RuntimeKeepFree= #RuntimeMaxFileSize= +#RuntimeMaxFiles=100 #MaxRetentionSec= #MaxFileSec=1month #ForwardToSyslog=no diff --git a/config-archive/etc/systemd/journald.conf.1 b/config-archive/etc/systemd/journald.conf.1 new file mode 100644 index 0000000..2e34451 --- /dev/null +++ b/config-archive/etc/systemd/journald.conf.1 @@ -0,0 +1,40 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# Entries in this file show the compile time defaults. +# You can change settings by editing this file. +# Defaults can be restored by simply deleting this file. +# +# See journald.conf(5) for details. + +[Journal] +#Storage=auto +#Compress=yes +#Seal=yes +#SplitMode=uid +#SyncIntervalSec=5m +#RateLimitInterval=30s +#RateLimitBurst=1000 +#SystemMaxUse= +#SystemKeepFree= +#SystemMaxFileSize= +#RuntimeMaxUse= +#RuntimeKeepFree= +#RuntimeMaxFileSize= +#MaxRetentionSec= +#MaxFileSec=1month +#ForwardToSyslog=no +ForwardToSyslog=yes +#ForwardToKMsg=no +#ForwardToConsole=no +#ForwardToWall=yes +#TTYPath=/dev/console +#MaxLevelStore=debug +#MaxLevelSyslog=debug +#MaxLevelKMsg=notice +#MaxLevelConsole=info +#MaxLevelWall=emerg diff --git a/config-archive/etc/systemd/journald.conf.dist b/config-archive/etc/systemd/journald.conf.dist index 2541b94..03fce40 100644 --- a/config-archive/etc/systemd/journald.conf.dist +++ b/config-archive/etc/systemd/journald.conf.dist @@ -39,3 +39,4 @@ #MaxLevelKMsg=notice #MaxLevelConsole=info #MaxLevelWall=emerg +#LineMax=48K diff --git a/config-archive/etc/systemd/resolved.conf.dist.new b/config-archive/etc/systemd/resolved.conf.dist similarity index 97% rename from config-archive/etc/systemd/resolved.conf.dist.new rename to config-archive/etc/systemd/resolved.conf.dist index b2340a5..cd2c489 100644 --- a/config-archive/etc/systemd/resolved.conf.dist.new +++ b/config-archive/etc/systemd/resolved.conf.dist @@ -16,6 +16,7 @@ #FallbackDNS=8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844 #Domains= #LLMNR=yes +#MulticastDNS=yes #DNSSEC=allow-downgrade #Cache=yes #DNSStubListener=udp diff --git a/systemd/journald.conf b/systemd/journald.conf index 13df9e4..52bb07b 100644 --- a/systemd/journald.conf +++ b/systemd/journald.conf @@ -40,3 +40,4 @@ ForwardToSyslog=yes #MaxLevelKMsg=notice #MaxLevelConsole=info #MaxLevelWall=emerg +#LineMax=48K diff --git a/systemd/network/50-static.network b/systemd/network/50-static.network index 0b0d384..70f19fa 100644 --- a/systemd/network/50-static.network +++ b/systemd/network/50-static.network @@ -8,3 +8,4 @@ DNS=217.66.52.10 DNS=212.91.225.75 Domains=pixelpark.com pixelpark.net brehm-online.com uhu-banane.de uhu-banane.net +# vim: filetype=dosini diff --git a/systemd/resolved.conf b/systemd/resolved.conf index 3c923ef..47c8f33 100644 --- a/systemd/resolved.conf +++ b/systemd/resolved.conf @@ -18,3 +18,7 @@ DNS=217.66.52.10 212.91.225.75 #Domains=pixelpark.com brehm-online.com uhu-banane.de uhu-banane.net +#MulticastDNS=yes +#DNSSEC=allow-downgrade +#Cache=yes +#DNSStubListener=udp -- 2.39.5