From b56072911f75c2ed5cd4e1b1eac28166e57dbd60 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 8 Jan 2018 18:11:05 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 7 +++ .../etc/logrotate.d/elog-save-summary | 11 ++++ .../logrotate.d/elog-save-summary.dist.new | 10 ++++ config-archive/etc/ssmtp/revaliases | 8 +++ config-archive/etc/ssmtp/revaliases.dist.new | 6 ++ config-archive/etc/ssmtp/ssmtp.conf | 56 +++++++++++++++++++ config-archive/etc/ssmtp/ssmtp.conf.dist.new | 51 +++++++++++++++++ 7 files changed, 149 insertions(+) create mode 100644 config-archive/etc/logrotate.d/elog-save-summary create mode 100644 config-archive/etc/logrotate.d/elog-save-summary.dist.new create mode 100644 config-archive/etc/ssmtp/revaliases create mode 100644 config-archive/etc/ssmtp/revaliases.dist.new create mode 100644 config-archive/etc/ssmtp/ssmtp.conf create mode 100644 config-archive/etc/ssmtp/ssmtp.conf.dist.new diff --git a/.etckeeper b/.etckeeper index c0caed5..c7eebfd 100755 --- a/.etckeeper +++ b/.etckeeper @@ -203,6 +203,8 @@ maybe chmod 0644 'config-archive/etc/logrotate.conf.dist.new' maybe chmod 0755 'config-archive/etc/logrotate.d' maybe chmod 0644 'config-archive/etc/logrotate.d/apache2' maybe chmod 0644 'config-archive/etc/logrotate.d/apache2.dist.new' +maybe chmod 0644 'config-archive/etc/logrotate.d/elog-save-summary' +maybe chmod 0644 'config-archive/etc/logrotate.d/elog-save-summary.dist.new' maybe chmod 0644 'config-archive/etc/logrotate.d/rsyslog' maybe chmod 0644 'config-archive/etc/logrotate.d/rsyslog.dist.new' maybe chmod 0755 'config-archive/etc/mysql' @@ -215,6 +217,11 @@ maybe chmod 0644 'config-archive/etc/rsyslog.conf.dist.new' maybe chmod 0755 'config-archive/etc/rsyslog.d' maybe chmod 0644 'config-archive/etc/rsyslog.d/50-default.conf' maybe chmod 0644 'config-archive/etc/rsyslog.d/50-default.conf.dist.new' +maybe chmod 0755 'config-archive/etc/ssmtp' +maybe chmod 0644 'config-archive/etc/ssmtp/revaliases' +maybe chmod 0644 'config-archive/etc/ssmtp/revaliases.dist.new' +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.dist' diff --git a/config-archive/etc/logrotate.d/elog-save-summary b/config-archive/etc/logrotate.d/elog-save-summary new file mode 100644 index 0000000..5f4f36a --- /dev/null +++ b/config-archive/etc/logrotate.d/elog-save-summary @@ -0,0 +1,11 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Rotate the log created by the save_summary elog module. + +/var/log/portage/elog/summary.log { + su portage portage + rotate 30 + missingok + nocreate + delaycompress +} diff --git a/config-archive/etc/logrotate.d/elog-save-summary.dist.new b/config-archive/etc/logrotate.d/elog-save-summary.dist.new new file mode 100644 index 0000000..f2cfc66 --- /dev/null +++ b/config-archive/etc/logrotate.d/elog-save-summary.dist.new @@ -0,0 +1,10 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Rotate the log created by the save_summary elog module. + +/var/log/portage/elog/summary.log { + su portage portage + missingok + nocreate + delaycompress +} diff --git a/config-archive/etc/ssmtp/revaliases b/config-archive/etc/ssmtp/revaliases new file mode 100644 index 0000000..1ee06cf --- /dev/null +++ b/config-archive/etc/ssmtp/revaliases @@ -0,0 +1,8 @@ +# sSMTP aliases +# +# Format: local_account:outgoing_address:mailhub +# +# Example: root:your_login@your.domain:mailhub.your.domain[:port] +# where [:port] is an optional port number that defaults to 25. +root:frank.brehm@pixelpark.com:mail02.pixelpark.com + diff --git a/config-archive/etc/ssmtp/revaliases.dist.new b/config-archive/etc/ssmtp/revaliases.dist.new new file mode 100644 index 0000000..77ff91f --- /dev/null +++ b/config-archive/etc/ssmtp/revaliases.dist.new @@ -0,0 +1,6 @@ +# sSMTP aliases +# +# Format: local_account:outgoing_address:mailhub +# +# Example: root:your_login@your.domain:mailhub.your.domain[:port] +# where [:port] is an optional port number that defaults to 25. diff --git a/config-archive/etc/ssmtp/ssmtp.conf b/config-archive/etc/ssmtp/ssmtp.conf new file mode 100644 index 0000000..6ac611d --- /dev/null +++ b/config-archive/etc/ssmtp/ssmtp.conf @@ -0,0 +1,56 @@ +# +# /etc/ssmtp.conf -- a config file for sSMTP sendmail. +# + +# The person who gets all mail for userids < MinUserId +# Make this empty to disable rewriting. +root=frank.brehm@pixelpark.com + +# All mail delivered to userid >= MinUserId goes to user, not root. +#MinUserId=1000 + +# The place where the mail goes. The actual machine name is required +# no MX records are consulted. Commonly mailhosts are named mail.domain.com +# The example will fit if you are in domain.com and your mailhub is so named. +mailhub=mail02.pixelpark.com + +# Example for SMTP port number 2525 +# mailhub=mail.your.domain:2525 +# Example for SMTP port number 25 (Standard/RFC) +# mailhub=mail.your.domain +# Example for SSL encrypted connection +# mailhub=mail.your.domain:465 + +# Where will the mail seem to come from? +#rewriteDomain= +rewriteDomain=pixelpark.com + +# The full hostname + +# Gentoo bug #47562 +# Commenting the following line will force ssmtp to figure +# out the hostname itself. + +# hostname=_HOSTNAME_ +hostname=berta.pixelpark.com + +# Set this to never rewrite the "From:" line (unless not given) and to +# use that address in the "from line" of the envelope. +FromLineOverride=YES + +# Use SSL/TLS to send secure messages to server. +#UseTLS=YES + +UseTLS=YES +UseSTARTTLS=YES + +# Use SSL/TLS certificate to authenticate against smtp host. +#UseTLSCert=YES + +# Use this RSA certificate. +#TLSCert=/etc/ssl/certs/ssmtp.pem + +# Get enhanced (*really* enhanced) debugging information in the logs +# If you want to have debugging of the config file parsing, move this option +# to the top of the config file and uncomment +#Debug=YES diff --git a/config-archive/etc/ssmtp/ssmtp.conf.dist.new b/config-archive/etc/ssmtp/ssmtp.conf.dist.new new file mode 100644 index 0000000..75900b2 --- /dev/null +++ b/config-archive/etc/ssmtp/ssmtp.conf.dist.new @@ -0,0 +1,51 @@ +# +# /etc/ssmtp.conf -- a config file for sSMTP sendmail. +# + +# The person who gets all mail for userids < MinUserId +# Make this empty to disable rewriting. +root=postmaster + +# All mail delivered to userid >= MinUserId goes to user, not root. +#MinUserId=1000 + +# The place where the mail goes. The actual machine name is required +# no MX records are consulted. Commonly mailhosts are named mail.domain.com +# The example will fit if you are in domain.com and your mailhub is so named. +mailhub=mail + +# Example for SMTP port number 2525 +# mailhub=mail.your.domain:2525 +# Example for SMTP port number 25 (Standard/RFC) +# mailhub=mail.your.domain +# Example for SSL encrypted connection +# mailhub=mail.your.domain:465 + +# Where will the mail seem to come from? +#rewriteDomain= + +# The full hostname + +# Gentoo bug #47562 +# Commenting the following line will force ssmtp to figure +# out the hostname itself. + +# hostname=_HOSTNAME_ + +# Set this to never rewrite the "From:" line (unless not given) and to +# use that address in the "from line" of the envelope. +#FromLineOverride=YES + +# Use SSL/TLS to send secure messages to server. +#UseTLS=YES + +# Use SSL/TLS certificate to authenticate against smtp host. +#UseTLSCert=YES + +# Use this RSA certificate. +#TLSCert=/etc/ssl/certs/ssmtp.pem + +# Get enhanced (*really* enhanced) debugging information in the logs +# If you want to have debugging of the config file parsing, move this option +# to the top of the config file and uncomment +#Debug=YES -- 2.39.5