From 0dc4d0841fee27661e2a12f30bbddc9ca9128378 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 21 Jul 2020 15:42:54 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 7 +++++++ apparmor.d/usr.sbin.named | 2 ++ apt/sources.list.d/flexiondotorg-minecraft-focal.list | 2 ++ apt/sources.list.d/google-chrome.list | 3 +++ apt/sources.list.d/nextcloud-devs-client-bionic.list | 2 ++ apt/sources.list.d/plexmediaserver.list | 3 +++ apt/sources.list.d/puppet.list | 2 ++ apt/sources.list.d/team-xbmc-ppa-focal.list | 2 ++ apt/sources.list.d/teams.list | 3 +++ 9 files changed, 26 insertions(+) create mode 100644 apt/sources.list.d/flexiondotorg-minecraft-focal.list create mode 100644 apt/sources.list.d/google-chrome.list create mode 100644 apt/sources.list.d/nextcloud-devs-client-bionic.list create mode 100644 apt/sources.list.d/plexmediaserver.list create mode 100644 apt/sources.list.d/puppet.list create mode 100644 apt/sources.list.d/team-xbmc-ppa-focal.list create mode 100644 apt/sources.list.d/teams.list diff --git a/.etckeeper b/.etckeeper index 12177a3..dbf8350 100755 --- 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 a4622da..fc5d7ff 100644 --- 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 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 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 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 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 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 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 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 -- 2.39.5