From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 16 Aug 2018 16:46:42 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to apt run
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=3d977457361a894a7df749369417a932b3a27236;p=config%2Fbruni%2Fetc-mint.git

saving uncommitted changes in /etc prior to apt run
---

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 0000000..50d2fb0
Binary files /dev/null and b/apt/trusted.gpg.d/puppet-keyring.gpg differ
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