From 3d977457361a894a7df749369417a932b3a27236 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 16 Aug 2018 18:46:42 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to apt run

---
 .etckeeper                           |   4 ++++
 apt/sources.list.d/puppet.list       |   9 +++++++++
 apt/trusted.gpg.d/puppet-keyring.gpg | Bin 0 -> 5067 bytes
 ppp/forticlientsslvpn.cleanup.tmp    |   1 +
 resolv.conf.sslvpn.backup            |  18 ++++++++++++++++++
 vim/ftdetect                         |   1 +
 vim/ftplugin                         |   1 +
 vim/indent                           |   1 +
 vim/plugin                           |   1 +
 vim/syntax                           |   1 +
 10 files changed, 37 insertions(+)
 create mode 100644 apt/sources.list.d/puppet.list
 create mode 100644 apt/trusted.gpg.d/puppet-keyring.gpg
 create mode 100644 ppp/forticlientsslvpn.cleanup.tmp
 create mode 100644 resolv.conf.sslvpn.backup
 create mode 120000 vim/ftdetect
 create mode 120000 vim/ftplugin
 create mode 120000 vim/indent
 create mode 120000 vim/plugin
 create mode 120000 vim/syntax

diff --git a/.etckeeper b/.etckeeper
index 2d739cd..bd706c9 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -504,9 +504,11 @@ maybe chmod 0644 'apt/sources.list.d/google-chrome.list'
 maybe chmod 0644 'apt/sources.list.d/official-package-repositories.list'
 maybe chmod 0644 'apt/sources.list.d/plex-media-server.list'
 maybe chmod 0644 'apt/sources.list.d/plexmediaserver.list'
+maybe chmod 0644 'apt/sources.list.d/puppet.list'
 maybe chmod 0644 'apt/sources.list.d/webupd8team-java-bionic.list'
 maybe chmod 0644 'apt/trusted.gpg'
 maybe chmod 0755 'apt/trusted.gpg.d'
+maybe chmod 0644 'apt/trusted.gpg.d/puppet-keyring.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-defaults.chroot.key.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg'
@@ -2411,6 +2413,7 @@ maybe chgrp 'dip' 'ppp'
 maybe chmod 0755 'ppp'
 maybe chmod 0600 'ppp/chap-secrets'
 maybe chmod 0644 'ppp/forticlientsslvpn.backup.tmp'
+maybe chmod 0644 'ppp/forticlientsslvpn.cleanup.tmp'
 maybe chmod 0755 'ppp/ip-down'
 maybe chmod 0755 'ppp/ip-down.d'
 maybe chmod 0755 'ppp/ip-down.d/0000usepeerdns'
@@ -2480,6 +2483,7 @@ maybe chmod 0755 'request-key.d'
 maybe chmod 0644 'request-key.d/cifs.idmap.conf'
 maybe chmod 0644 'request-key.d/cifs.spnego.conf'
 maybe chmod 0644 'request-key.d/id_resolver.conf'
+maybe chmod 0644 'resolv.conf.sslvpn.backup'
 maybe chmod 0755 'resolvconf'
 maybe chmod 0755 'resolvconf/update-libc.d'
 maybe chmod 0755 'resolvconf/update-libc.d/avahi-daemon'
diff --git a/apt/sources.list.d/puppet.list b/apt/sources.list.d/puppet.list
new file mode 100644
index 0000000..0bbb797
--- /dev/null
+++ b/apt/sources.list.d/puppet.list
@@ -0,0 +1,9 @@
+# Puppet bionic Repository
+deb http://apt.puppetlabs.com bionic puppet
+
+# Puppet bionic Source Repository
+# The source repos are commented out by default because we
+# do not always make sources available for all packages or
+# for all platforms. If you want to access the source repos,
+# uncomment the following line.
+#deb-src http://apt.puppetlabs.com bionic puppet
diff --git a/apt/trusted.gpg.d/puppet-keyring.gpg b/apt/trusted.gpg.d/puppet-keyring.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..50d2fb081ed706fa288653c3de1cb72fe6007497
GIT binary patch
literal 5067
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
P)csMBZzM!WqIdrT54&W3

literal 0
HcmV?d00001

diff --git a/ppp/forticlientsslvpn.cleanup.tmp b/ppp/forticlientsslvpn.cleanup.tmp
new file mode 100644
index 0000000..fc4a2cc
--- /dev/null
+++ b/ppp/forticlientsslvpn.cleanup.tmp
@@ -0,0 +1 @@
+route=del,93.188.110.49,255.255.255.255,0,10.12.11.254,br0
diff --git a/resolv.conf.sslvpn.backup b/resolv.conf.sslvpn.backup
new file mode 100644
index 0000000..44be2aa
--- /dev/null
+++ b/resolv.conf.sslvpn.backup
@@ -0,0 +1,18 @@
+# This file is managed by man:systemd-resolved(8). Do not edit.
+#
+# This is a dynamic resolv.conf file for connecting local clients to the
+# internal DNS stub resolver of systemd-resolved. This file lists all
+# configured search domains.
+#
+# Run "systemd-resolve --status" to see details about the uplink DNS servers
+# currently in use.
+#
+# Third party programs must not access this file directly, but only through the
+# symlink at /etc/resolv.conf. To manage man:resolv.conf(5) in a different way,
+# replace this symlink by a static file or a different symlink.
+#
+# See man:systemd-resolved.service(8) for details about the supported modes of
+# operation for /etc/resolv.conf.
+
+nameserver 127.0.0.53
+search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de
diff --git a/vim/ftdetect b/vim/ftdetect
new file mode 120000
index 0000000..cb33ac0
--- /dev/null
+++ b/vim/ftdetect
@@ -0,0 +1 @@
+/usr/share/vim/addons/ftdetect
\ No newline at end of file
diff --git a/vim/ftplugin b/vim/ftplugin
new file mode 120000
index 0000000..1f12bca
--- /dev/null
+++ b/vim/ftplugin
@@ -0,0 +1 @@
+/usr/share/vim/addons/ftplugin
\ No newline at end of file
diff --git a/vim/indent b/vim/indent
new file mode 120000
index 0000000..481b7b8
--- /dev/null
+++ b/vim/indent
@@ -0,0 +1 @@
+/usr/share/vim/addons/indent
\ No newline at end of file
diff --git a/vim/plugin b/vim/plugin
new file mode 120000
index 0000000..e361062
--- /dev/null
+++ b/vim/plugin
@@ -0,0 +1 @@
+/usr/share/vim/addons/plugin
\ No newline at end of file
diff --git a/vim/syntax b/vim/syntax
new file mode 120000
index 0000000..e71d61f
--- /dev/null
+++ b/vim/syntax
@@ -0,0 +1 @@
+/usr/share/vim/addons/syntax
\ No newline at end of file
-- 
2.39.5