saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 006b2a4275a7d45c5f1516457aafc6e5aa2b348b..268f207338b209a82fc7c747894e3a179edf6c0e 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -161,6 +161,7 @@ maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-stretch-security-automatic.gp
 maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-stretch-stable.gpg'
 maybe chmod 0755 'apticron'
 maybe chmod 0644 'apticron/README'
+maybe chmod 0644 'apticron/apticron.conf'
 maybe chgrp 'daemon' 'at.deny'
 maybe chmod 0640 'at.deny'
 maybe chmod 0644 'bash.bashrc'

diff --git a/apticron/apticron.conf b/apticron/apticron.conf
new file mode 100644 (file)
index 0000000..5b588d9
--- /dev/null
+++ b/apticron/apticron.conf
@@ -0,0 +1,132 @@
+# apticron.conf
+#
+# The values set in /etc/apticron/apticron.conf will override the settings
+# in this file.
+
+#
+# Set EMAIL to a space separated list of addresses which will be notified of
+# impending updates. By default the root account will be notified.
+#
+EMAIL="root"
+
+#
+# Set DIFF_ONLY to "1" to only output the difference of the current run
+# compared to the last run (ie. only new upgrades since the last run). If there
+# are no differences, no output/email will be generated. By default, apticron
+# will output everything that needs to be upgraded.
+#
+# DIFF_ONLY="1"
+#
+DIFF_ONLY="0"
+
+#
+# Set LISTCHANGES_PROFILE if you would like apticron to invoke apt-listchanges
+# with the --profile option. You should add a corresponding profile to
+# /etc/apt/listchanges.conf
+#
+# LISTCHANGES_PROFILE="apticron"
+#
+# By default apt-listchanges is run with no profile
+#
+LISTCHANGE_PROFILE=""
+
+#
+# From hostname manpage: "Displays  all FQDNs of the machine. This option
+# enumerates all configured network addresses on all configured network inter‐
+# faces, and translates them to DNS domain names. Addresses that cannot be
+# translated (i.e. because they do not have an appropriate  reverse DNS
+# entry) are skipped. Note that different addresses may resolve to the same
+# name, therefore the output may contain duplicate entries. Do not make any
+# assumptions about the order of the output."
+#
+# By default only the first FQDN is used
+#
+# ALL_FQDNS="1"
+ALL_FQDNS="0"
+
+#
+# Set SYSTEM if you would like apticron to use something other than the output
+# of "hostname -f" for the system name in the mails it generates. This option
+# overrides the ALL_FQDNS above.
+#
+# SYSTEM="foobar.example.com"
+#
+SYSTEM=$(/bin/hostname -f)
+
+#
+# Set IPADDRESSNUM if you would like to configure the maximal number of IP
+# addresses apticron displays. The default is to display 1 address of each
+# family type (inet, inet6), if available.
+#
+IPADDRESSNUM="1"
+
+#
+# Set IPADDRESSES to a whitespace separated list of reachable addresses for
+# this system. If unset or empty, apticron will try to work these out using
+# the "ip" command.
+#
+# IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1"
+#
+IPADDRESSES=""
+
+#
+# Set NOTIFY_HOLDS="0" if you don't want to be notified about new versions of
+# packages on hold in your system. The default behavior is downloading and
+# listing them as any other package.
+#
+# NOTIFY_HOLDS="0"
+#
+NOTIFY_HOLDS="1"
+
+#
+# Set NOTIFY_NEW="0" if you don't want to be notified about packages which
+# are not installed in your system. Yes, it's possible! There are some issues
+# related to systems which have mixed stable/unstable sources. In these cases
+# apt-get will consider for example that packages with "Priority:
+# required"/"Essential: yes" in unstable but not in stable should be installed,
+# so they will be listed in dist-upgrade output. Please take a look at
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=531002#44
+#
+# NOTIFY_NEW="0"
+#
+NOTIFY_NEW="1"
+
+#
+# Set NOTIFY_NO_UPDATES="1" if you want to be notified when there are no
+# new versions. This is useful to assure you that apticron works well.
+# By default notifications will be sent only when new versions are available.
+#
+# NOTIFY_NO_UPDATES="1"
+#
+NOTIFY_NO_UPDATES="0"
+
+#
+# Set CUSTOM_SUBJECT if you want to replace the default subject used in
+# the notification e-mails. This may help filtering/sorting client-side e-mail.
+# If you want to use internal vars please use single quotes here. Ex:
+# CUSTOM_SUBJECT='[apticron] $SYSTEM: $NUM_PACKAGES package update(s)'
+#
+# CUSTOM_SUBJECT=""
+
+#
+# Set CUSTOM_NO_UPDATES_SUBJECT if you want to replace the default subject used
+# in the no update notification e-mails. This may help filtering/sorting
+# client-side e-mail.
+# If you want to use internal vars please use single quotes here. Ex:
+# CUSTOM_NO_UPDATES_SUBJECT='[apticron] $SYSTEM: no updates'
+#
+# CUSTOM_NO_UPDATES_SUBJECT=""
+
+#
+# Set CUSTOM_FROM if you want to replace the default sender by changing the
+# 'From:' field used in the notification e-mails.
+#
+# CUSTOM_FROM=""
+
+# Set GPG_ENCRYPT="1" if you want to encrypt the mail being send to
+# $EMAIL. apticron will use gpg and the public key of the recipient to encrypt
+# the mail. Please note that the $EMAIL value above can't be an alias, since
+# gpg will trust it to encrypt the message.
+#
+GPG_ENCRYPT="0"
+

diff --git a/motd b/motd
index e4245fed0c404a07a00eeac617a05c095ed969e8..ac489d662dd22fbf2adacef79653f8e2d3a5e502 100644 (file)
--- a/motd
+++ b/motd
@@ -6,10 +6,9 @@ Debian GNU/Linux 10 (buster)
 |_| |_|\___|_|\__, |\__,_|
               |___/       
 
-Man will nicht nur glücklich sein, sondern glücklicher als die
-anderen. Und das ist deshalb so schwer, weil wir die anderen für
-glücklicher halten, als sie sind.
-               -- Charles-Louis de Montesquieu
+Meinungsmanagement ist billiger als Gewalt, Bestechung oder andere
+mögliche Kontrolltechniken.
+               -- Harold D. Lasswell
 
 Today is Pungenday, the 40th day of Discord in the YOLD 3187
 

diff --git a/passwd b/passwd
index e970e09a42f01d5d28539aee6703e67d6958af86..bba09697c0294eb80b17363e1cfbff2082c34b8a 100644 (file)
--- a/passwd
+++ b/passwd
@@ -1,4 +1,4 @@
-root:x:0:0:root:/root:/bin/bash
+root:x:0:0:root Helga:/root:/bin/bash
 daemon:x:1:1:daemon:/usr/sbin:/usr/sbin/nologin
 bin:x:2:2:bin:/bin:/usr/sbin/nologin
 sys:x:3:3:sys:/dev:/usr/sbin/nologin

diff --git a/passwd- b/passwd-
index 79d8be151352d72b12634ee817702c58f3020192..e970e09a42f01d5d28539aee6703e67d6958af86 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -41,4 +41,4 @@ netdata:x:2004:2004::/home/netdata:/usr/sbin/nologin
 ulog:x:115:124::/var/log/ulog:/bin/false
 nagios:x:116:125::/var/lib/nagios:/usr/sbin/nologin
 taurec:x:1000:100:Joern Valentin:/home/taurec:/bin/sh
-minecraft:x:1222:100:Minecraft server user:/home/minecraft:/bin/sh
+minecraft:x:1222:100:Minecraft server user:/home/minecraft:/bin/bash