From bb97991482c46b68b57d12a001772ec6ffe90932 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 11 Jan 2021 09:22:08 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 43 ++++++++++++------- .../fbrehm.list | 0 .../flexiondotorg-minecraft-bionic.list | 0 .../google-chrome.list | 0 .../nextcloud-devs-client-bionic.list | 0 .../official-package-repositories.list | 0 .../official-source-repositories.list | 0 .../plex-media-server.list | 0 .../plexmediaserver.list | 0 .../puppet.list | 0 .../signal-xenial.list | 0 .../team-xbmc-ppa-bionic.list | 0 .../teams.list | 0 .../ubuntu-x-swat-updates-bionic.list | 0 .../webupd8team-java-bionic.list | 0 apt/sources.list.d.bak.2021-01-11/fbrehm.list | 7 +++ .../flexiondotorg-minecraft-focal.list | 2 + .../google-chrome.list | 3 ++ .../nextcloud-devs-client-bionic.list | 2 + .../nilarimogard-webupd8-focal.list | 2 + .../official-package-repositories.list | 8 ++++ .../official-source-repositories.list | 0 .../plexmediaserver.list | 3 ++ apt/sources.list.d.bak.2021-01-11/puppet.list | 2 + .../team-xbmc-ppa-focal.list | 2 + apt/sources.list.d.bak.2021-01-11/teams.list | 3 ++ .../official-package-repositories.list | 8 ++-- 27 files changed, 65 insertions(+), 20 deletions(-) rename apt/{sources.list.d.bak => sources.list.d.bak.2020-07-21}/fbrehm.list (100%) rename apt/{sources.list.d.bak => sources.list.d.bak.2020-07-21}/flexiondotorg-minecraft-bionic.list (100%) rename apt/{sources.list.d.bak => sources.list.d.bak.2020-07-21}/google-chrome.list (100%) rename apt/{sources.list.d.bak => sources.list.d.bak.2020-07-21}/nextcloud-devs-client-bionic.list (100%) rename apt/{sources.list.d.bak => sources.list.d.bak.2020-07-21}/official-package-repositories.list (100%) rename apt/{sources.list.d.bak => sources.list.d.bak.2020-07-21}/official-source-repositories.list (100%) rename apt/{sources.list.d.bak => sources.list.d.bak.2020-07-21}/plex-media-server.list (100%) rename apt/{sources.list.d.bak => sources.list.d.bak.2020-07-21}/plexmediaserver.list (100%) rename apt/{sources.list.d.bak => sources.list.d.bak.2020-07-21}/puppet.list (100%) rename apt/{sources.list.d.bak => sources.list.d.bak.2020-07-21}/signal-xenial.list (100%) rename apt/{sources.list.d.bak => sources.list.d.bak.2020-07-21}/team-xbmc-ppa-bionic.list (100%) rename apt/{sources.list.d.bak => sources.list.d.bak.2020-07-21}/teams.list (100%) rename apt/{sources.list.d.bak => sources.list.d.bak.2020-07-21}/ubuntu-x-swat-updates-bionic.list (100%) rename apt/{sources.list.d.bak => sources.list.d.bak.2020-07-21}/webupd8team-java-bionic.list (100%) create mode 100644 apt/sources.list.d.bak.2021-01-11/fbrehm.list create mode 100644 apt/sources.list.d.bak.2021-01-11/flexiondotorg-minecraft-focal.list create mode 100644 apt/sources.list.d.bak.2021-01-11/google-chrome.list create mode 100644 apt/sources.list.d.bak.2021-01-11/nextcloud-devs-client-bionic.list create mode 100644 apt/sources.list.d.bak.2021-01-11/nilarimogard-webupd8-focal.list create mode 100644 apt/sources.list.d.bak.2021-01-11/official-package-repositories.list rename apt/{sources.list.d => sources.list.d.bak.2021-01-11}/official-source-repositories.list (100%) create mode 100644 apt/sources.list.d.bak.2021-01-11/plexmediaserver.list create mode 100644 apt/sources.list.d.bak.2021-01-11/puppet.list create mode 100644 apt/sources.list.d.bak.2021-01-11/team-xbmc-ppa-focal.list create mode 100644 apt/sources.list.d.bak.2021-01-11/teams.list diff --git a/.etckeeper b/.etckeeper index 1239fe9..b2f6e74 100755 --- a/.etckeeper +++ b/.etckeeper @@ -543,28 +543,39 @@ maybe chmod 0644 'apt/preferences.d/official-package-repositories.pref' maybe chmod 0644 'apt/repo.uhu-banane.de.gpg-key2.pub' maybe chmod 0644 'apt/sources.list' maybe chmod 0755 'apt/sources.list.d' -maybe chmod 0755 'apt/sources.list.d.bak' -maybe chmod 0644 'apt/sources.list.d.bak/fbrehm.list' -maybe chmod 0644 'apt/sources.list.d.bak/flexiondotorg-minecraft-bionic.list' -maybe chmod 0644 'apt/sources.list.d.bak/google-chrome.list' -maybe chmod 0644 'apt/sources.list.d.bak/nextcloud-devs-client-bionic.list' -maybe chmod 0644 'apt/sources.list.d.bak/official-package-repositories.list' -maybe chmod 0644 'apt/sources.list.d.bak/official-source-repositories.list' -maybe chmod 0644 'apt/sources.list.d.bak/plex-media-server.list' -maybe chmod 0644 'apt/sources.list.d.bak/plexmediaserver.list' -maybe chmod 0644 'apt/sources.list.d.bak/puppet.list' -maybe chmod 0644 'apt/sources.list.d.bak/signal-xenial.list' -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 0755 'apt/sources.list.d.bak.2020-07-21' +maybe chmod 0644 'apt/sources.list.d.bak.2020-07-21/fbrehm.list' +maybe chmod 0644 'apt/sources.list.d.bak.2020-07-21/flexiondotorg-minecraft-bionic.list' +maybe chmod 0644 'apt/sources.list.d.bak.2020-07-21/google-chrome.list' +maybe chmod 0644 'apt/sources.list.d.bak.2020-07-21/nextcloud-devs-client-bionic.list' +maybe chmod 0644 'apt/sources.list.d.bak.2020-07-21/official-package-repositories.list' +maybe chmod 0644 'apt/sources.list.d.bak.2020-07-21/official-source-repositories.list' +maybe chmod 0644 'apt/sources.list.d.bak.2020-07-21/plex-media-server.list' +maybe chmod 0644 'apt/sources.list.d.bak.2020-07-21/plexmediaserver.list' +maybe chmod 0644 'apt/sources.list.d.bak.2020-07-21/puppet.list' +maybe chmod 0644 'apt/sources.list.d.bak.2020-07-21/signal-xenial.list' +maybe chmod 0644 'apt/sources.list.d.bak.2020-07-21/team-xbmc-ppa-bionic.list' +maybe chmod 0644 'apt/sources.list.d.bak.2020-07-21/teams.list' +maybe chmod 0644 'apt/sources.list.d.bak.2020-07-21/ubuntu-x-swat-updates-bionic.list' +maybe chmod 0644 'apt/sources.list.d.bak.2020-07-21/webupd8team-java-bionic.list' +maybe chmod 0755 'apt/sources.list.d.bak.2021-01-11' +maybe chmod 0644 'apt/sources.list.d.bak.2021-01-11/fbrehm.list' +maybe chmod 0644 'apt/sources.list.d.bak.2021-01-11/flexiondotorg-minecraft-focal.list' +maybe chmod 0644 'apt/sources.list.d.bak.2021-01-11/google-chrome.list' +maybe chmod 0644 'apt/sources.list.d.bak.2021-01-11/nextcloud-devs-client-bionic.list' +maybe chmod 0644 'apt/sources.list.d.bak.2021-01-11/nilarimogard-webupd8-focal.list' +maybe chmod 0644 'apt/sources.list.d.bak.2021-01-11/official-package-repositories.list' +maybe chmod 0644 'apt/sources.list.d.bak.2021-01-11/official-source-repositories.list' +maybe chmod 0644 'apt/sources.list.d.bak.2021-01-11/plexmediaserver.list' +maybe chmod 0644 'apt/sources.list.d.bak.2021-01-11/puppet.list' +maybe chmod 0644 'apt/sources.list.d.bak.2021-01-11/team-xbmc-ppa-focal.list' +maybe chmod 0644 'apt/sources.list.d.bak.2021-01-11/teams.list' maybe chmod 0644 'apt/sources.list.d/fbrehm.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/nilarimogard-webupd8-focal.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' diff --git a/apt/sources.list.d.bak/fbrehm.list b/apt/sources.list.d.bak.2020-07-21/fbrehm.list similarity index 100% rename from apt/sources.list.d.bak/fbrehm.list rename to apt/sources.list.d.bak.2020-07-21/fbrehm.list diff --git a/apt/sources.list.d.bak/flexiondotorg-minecraft-bionic.list b/apt/sources.list.d.bak.2020-07-21/flexiondotorg-minecraft-bionic.list similarity index 100% rename from apt/sources.list.d.bak/flexiondotorg-minecraft-bionic.list rename to apt/sources.list.d.bak.2020-07-21/flexiondotorg-minecraft-bionic.list diff --git a/apt/sources.list.d.bak/google-chrome.list b/apt/sources.list.d.bak.2020-07-21/google-chrome.list similarity index 100% rename from apt/sources.list.d.bak/google-chrome.list rename to apt/sources.list.d.bak.2020-07-21/google-chrome.list diff --git a/apt/sources.list.d.bak/nextcloud-devs-client-bionic.list b/apt/sources.list.d.bak.2020-07-21/nextcloud-devs-client-bionic.list similarity index 100% rename from apt/sources.list.d.bak/nextcloud-devs-client-bionic.list rename to apt/sources.list.d.bak.2020-07-21/nextcloud-devs-client-bionic.list diff --git a/apt/sources.list.d.bak/official-package-repositories.list b/apt/sources.list.d.bak.2020-07-21/official-package-repositories.list similarity index 100% rename from apt/sources.list.d.bak/official-package-repositories.list rename to apt/sources.list.d.bak.2020-07-21/official-package-repositories.list diff --git a/apt/sources.list.d.bak/official-source-repositories.list b/apt/sources.list.d.bak.2020-07-21/official-source-repositories.list similarity index 100% rename from apt/sources.list.d.bak/official-source-repositories.list rename to apt/sources.list.d.bak.2020-07-21/official-source-repositories.list diff --git a/apt/sources.list.d.bak/plex-media-server.list b/apt/sources.list.d.bak.2020-07-21/plex-media-server.list similarity index 100% rename from apt/sources.list.d.bak/plex-media-server.list rename to apt/sources.list.d.bak.2020-07-21/plex-media-server.list diff --git a/apt/sources.list.d.bak/plexmediaserver.list b/apt/sources.list.d.bak.2020-07-21/plexmediaserver.list similarity index 100% rename from apt/sources.list.d.bak/plexmediaserver.list rename to apt/sources.list.d.bak.2020-07-21/plexmediaserver.list diff --git a/apt/sources.list.d.bak/puppet.list b/apt/sources.list.d.bak.2020-07-21/puppet.list similarity index 100% rename from apt/sources.list.d.bak/puppet.list rename to apt/sources.list.d.bak.2020-07-21/puppet.list diff --git a/apt/sources.list.d.bak/signal-xenial.list b/apt/sources.list.d.bak.2020-07-21/signal-xenial.list similarity index 100% rename from apt/sources.list.d.bak/signal-xenial.list rename to apt/sources.list.d.bak.2020-07-21/signal-xenial.list diff --git a/apt/sources.list.d.bak/team-xbmc-ppa-bionic.list b/apt/sources.list.d.bak.2020-07-21/team-xbmc-ppa-bionic.list similarity index 100% rename from apt/sources.list.d.bak/team-xbmc-ppa-bionic.list rename to apt/sources.list.d.bak.2020-07-21/team-xbmc-ppa-bionic.list diff --git a/apt/sources.list.d.bak/teams.list b/apt/sources.list.d.bak.2020-07-21/teams.list similarity index 100% rename from apt/sources.list.d.bak/teams.list rename to apt/sources.list.d.bak.2020-07-21/teams.list diff --git a/apt/sources.list.d.bak/ubuntu-x-swat-updates-bionic.list b/apt/sources.list.d.bak.2020-07-21/ubuntu-x-swat-updates-bionic.list similarity index 100% rename from apt/sources.list.d.bak/ubuntu-x-swat-updates-bionic.list rename to apt/sources.list.d.bak.2020-07-21/ubuntu-x-swat-updates-bionic.list diff --git a/apt/sources.list.d.bak/webupd8team-java-bionic.list b/apt/sources.list.d.bak.2020-07-21/webupd8team-java-bionic.list similarity index 100% rename from apt/sources.list.d.bak/webupd8team-java-bionic.list rename to apt/sources.list.d.bak.2020-07-21/webupd8team-java-bionic.list diff --git a/apt/sources.list.d.bak.2021-01-11/fbrehm.list b/apt/sources.list.d.bak.2021-01-11/fbrehm.list new file mode 100644 index 0000000..6b0569d --- /dev/null +++ b/apt/sources.list.d.bak.2021-01-11/fbrehm.list @@ -0,0 +1,7 @@ +# Packages Frank Brehm +# --------------------- + +#deb http://www.brehm-online.com/debian/buster ./ +deb http://repo.uhu-banane.de/Ubuntu/focal ./ +deb-src http://repo.uhu-banane.de/Sources ./ + diff --git a/apt/sources.list.d.bak.2021-01-11/flexiondotorg-minecraft-focal.list b/apt/sources.list.d.bak.2021-01-11/flexiondotorg-minecraft-focal.list new file mode 100644 index 0000000..cb34c29 --- /dev/null +++ b/apt/sources.list.d.bak.2021-01-11/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.bak.2021-01-11/google-chrome.list b/apt/sources.list.d.bak.2021-01-11/google-chrome.list new file mode 100644 index 0000000..b2d572c --- /dev/null +++ b/apt/sources.list.d.bak.2021-01-11/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.bak.2021-01-11/nextcloud-devs-client-bionic.list b/apt/sources.list.d.bak.2021-01-11/nextcloud-devs-client-bionic.list new file mode 100644 index 0000000..c2358d4 --- /dev/null +++ b/apt/sources.list.d.bak.2021-01-11/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.bak.2021-01-11/nilarimogard-webupd8-focal.list b/apt/sources.list.d.bak.2021-01-11/nilarimogard-webupd8-focal.list new file mode 100644 index 0000000..70b8637 --- /dev/null +++ b/apt/sources.list.d.bak.2021-01-11/nilarimogard-webupd8-focal.list @@ -0,0 +1,2 @@ +# deb http://ppa.launchpad.net/nilarimogard/webupd8/ubuntu focal main +# deb-src http://ppa.launchpad.net/nilarimogard/webupd8/ubuntu focal main diff --git a/apt/sources.list.d.bak.2021-01-11/official-package-repositories.list b/apt/sources.list.d.bak.2021-01-11/official-package-repositories.list new file mode 100644 index 0000000..772b5a9 --- /dev/null +++ b/apt/sources.list.d.bak.2021-01-11/official-package-repositories.list @@ -0,0 +1,8 @@ +deb http://ftp.fau.de/mint/packages ulyana main upstream import backport + +deb http://ftp.tu-ilmenau.de/mirror/ubuntu focal main restricted universe multiverse +deb http://ftp.tu-ilmenau.de/mirror/ubuntu focal-updates main restricted universe multiverse +deb http://ftp.tu-ilmenau.de/mirror/ubuntu focal-backports main restricted universe multiverse + +deb http://security.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse +deb http://archive.canonical.com/ubuntu/ focal partner diff --git a/apt/sources.list.d/official-source-repositories.list b/apt/sources.list.d.bak.2021-01-11/official-source-repositories.list similarity index 100% rename from apt/sources.list.d/official-source-repositories.list rename to apt/sources.list.d.bak.2021-01-11/official-source-repositories.list diff --git a/apt/sources.list.d.bak.2021-01-11/plexmediaserver.list b/apt/sources.list.d.bak.2021-01-11/plexmediaserver.list new file mode 100644 index 0000000..3c32ab5 --- /dev/null +++ b/apt/sources.list.d.bak.2021-01-11/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.bak.2021-01-11/puppet.list b/apt/sources.list.d.bak.2021-01-11/puppet.list new file mode 100644 index 0000000..731bf33 --- /dev/null +++ b/apt/sources.list.d.bak.2021-01-11/puppet.list @@ -0,0 +1,2 @@ +# Puppet bionic Repository +deb http://apt.puppetlabs.com focal puppet diff --git a/apt/sources.list.d.bak.2021-01-11/team-xbmc-ppa-focal.list b/apt/sources.list.d.bak.2021-01-11/team-xbmc-ppa-focal.list new file mode 100644 index 0000000..d5ba62b --- /dev/null +++ b/apt/sources.list.d.bak.2021-01-11/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.bak.2021-01-11/teams.list b/apt/sources.list.d.bak.2021-01-11/teams.list new file mode 100644 index 0000000..313011b --- /dev/null +++ b/apt/sources.list.d.bak.2021-01-11/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 diff --git a/apt/sources.list.d/official-package-repositories.list b/apt/sources.list.d/official-package-repositories.list index 772b5a9..f0afbe4 100644 --- a/apt/sources.list.d/official-package-repositories.list +++ b/apt/sources.list.d/official-package-repositories.list @@ -1,8 +1,8 @@ -deb http://ftp.fau.de/mint/packages ulyana main upstream import backport +deb http://packages.linuxmint.com ulyssa main upstream import backport #id:linuxmint_main -deb http://ftp.tu-ilmenau.de/mirror/ubuntu focal main restricted universe multiverse -deb http://ftp.tu-ilmenau.de/mirror/ubuntu focal-updates main restricted universe multiverse -deb http://ftp.tu-ilmenau.de/mirror/ubuntu focal-backports main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu focal main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu focal-updates main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu focal-backports main restricted universe multiverse deb http://security.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse deb http://archive.canonical.com/ubuntu/ focal partner -- 2.39.5