saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 12177a3979d8ff9b1ad959e2e9a07fe6777ea460..dbf83503724b9b0e219b51c9fa315b2b83b51f19 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -554,8 +554,15 @@ maybe chmod 0644 'apt/sources.list.d.bak/team-xbmc-ppa-bionic.list'
 maybe chmod 0644 'apt/sources.list.d.bak/teams.list'
 maybe chmod 0644 'apt/sources.list.d.bak/ubuntu-x-swat-updates-bionic.list'
 maybe chmod 0644 'apt/sources.list.d.bak/webupd8team-java-bionic.list'
+maybe chmod 0644 'apt/sources.list.d/flexiondotorg-minecraft-focal.list'
+maybe chmod 0644 'apt/sources.list.d/google-chrome.list'
+maybe chmod 0644 'apt/sources.list.d/nextcloud-devs-client-bionic.list'
 maybe chmod 0644 'apt/sources.list.d/official-package-repositories.list'
 maybe chmod 0644 'apt/sources.list.d/official-source-repositories.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/team-xbmc-ppa-focal.list'
+maybe chmod 0644 'apt/sources.list.d/teams.list'
 maybe chmod 0644 'apt/trusted.gpg'
 maybe chmod 0755 'apt/trusted.gpg.d'
 maybe chmod 0644 'apt/trusted.gpg.d/microsoft.gpg'

diff --git a/apparmor.d/usr.sbin.named b/apparmor.d/usr.sbin.named
index a4622da851ed140b6a047393cd231b598a679d04..fc5d7ff3f001bd3438638612fe0d01b5e43037ab 100644 (file)
--- a/apparmor.d/usr.sbin.named
+++ b/apparmor.d/usr.sbin.named
@@ -57,6 +57,8 @@
   # syslog do the heavy lifting.
   /var/log/named/** rw,
   /var/log/named/ rw,
+  /var/log/bind/** rw,
+  /var/log/bind/ rw,
 
   # gssapi
   /var/lib/sss/pubconf/krb5.include.d/** r,

diff --git a/apt/sources.list.d/flexiondotorg-minecraft-focal.list b/apt/sources.list.d/flexiondotorg-minecraft-focal.list
new file mode 100644 (file)
index 0000000..cb34c29
--- /dev/null
+++ b/apt/sources.list.d/flexiondotorg-minecraft-focal.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/flexiondotorg/minecraft/ubuntu focal main
+# deb-src http://ppa.launchpad.net/flexiondotorg/minecraft/ubuntu focal main

diff --git a/apt/sources.list.d/google-chrome.list b/apt/sources.list.d/google-chrome.list
new file mode 100644 (file)
index 0000000..b2d572c
--- /dev/null
+++ b/apt/sources.list.d/google-chrome.list
@@ -0,0 +1,3 @@
+### THIS FILE IS AUTOMATICALLY CONFIGURED ###
+# You may comment out this entry, but any other modifications may be lost.
+deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main

diff --git a/apt/sources.list.d/nextcloud-devs-client-bionic.list b/apt/sources.list.d/nextcloud-devs-client-bionic.list
new file mode 100644 (file)
index 0000000..c2358d4
--- /dev/null
+++ b/apt/sources.list.d/nextcloud-devs-client-bionic.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/nextcloud-devs/client/ubuntu focal main
+# deb-src http://ppa.launchpad.net/nextcloud-devs/client/ubuntu bionic main

diff --git a/apt/sources.list.d/plexmediaserver.list b/apt/sources.list.d/plexmediaserver.list
new file mode 100644 (file)
index 0000000..3c32ab5
--- /dev/null
+++ b/apt/sources.list.d/plexmediaserver.list
@@ -0,0 +1,3 @@
+# When enabling this repo please remember to add the PlexPublic.Key into the apt setup.
+# wget -q https://downloads.plex.tv/plex-keys/PlexSign.key -O - | sudo apt-key add -
+deb https://downloads.plex.tv/repo/deb/ public main

diff --git a/apt/sources.list.d/puppet.list b/apt/sources.list.d/puppet.list
new file mode 100644 (file)
index 0000000..731bf33
--- /dev/null
+++ b/apt/sources.list.d/puppet.list
@@ -0,0 +1,2 @@
+# Puppet bionic Repository
+deb http://apt.puppetlabs.com focal puppet

diff --git a/apt/sources.list.d/team-xbmc-ppa-focal.list b/apt/sources.list.d/team-xbmc-ppa-focal.list
new file mode 100644 (file)
index 0000000..d5ba62b
--- /dev/null
+++ b/apt/sources.list.d/team-xbmc-ppa-focal.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/team-xbmc/ppa/ubuntu focal main
+# deb-src http://ppa.launchpad.net/team-xbmc/ppa/ubuntu focal main

diff --git a/apt/sources.list.d/teams.list b/apt/sources.list.d/teams.list
new file mode 100644 (file)
index 0000000..313011b
--- /dev/null
+++ b/apt/sources.list.d/teams.list
@@ -0,0 +1,3 @@
+### THIS FILE IS AUTOMATICALLY CONFIGURED ###
+# You may comment out this entry, but any other modifications may be lost.
+deb [arch=amd64] https://packages.microsoft.com/repos/ms-teams stable main