saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index b47d1218b5a32b8c9ed023b77c1a67f408260148..3b8ce236f40aa167c35b3bf7fea8d79ca0192d27 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -624,9 +624,14 @@ maybe chmod 0644 'apt/apt.conf.d/70debconf'
 maybe chmod 0755 'apt/auth.conf.d'
 maybe chmod 0755 'apt/preferences.d'
 maybe chmod 0644 'apt/sources.list'
+maybe chmod 0644 'apt/sources.list.bak'
+maybe chmod 0644 'apt/sources.list.bak2'
 maybe chmod 0755 'apt/sources.list.d'
 maybe chmod 0644 'apt/sources.list.d/apache2.list'
+maybe chmod 0644 'apt/sources.list.d/apache2.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/webmin.list'
+maybe chmod 0644 'apt/sources.list.d/webmin.list.distUpgrade'
+maybe chmod 0644 'apt/sources.list.distUpgrade'
 maybe chmod 0644 'apt/trusted.gpg'
 maybe chmod 0755 'apt/trusted.gpg.d'
 maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg'

diff --git a/apt/sources.list b/apt/sources.list
index d44419f6ba50f4c2b4047314ced47a85d8f95160..5ffbddd76639b5a5791af8ae081f4dbd2babff84 100644 (file)
--- a/apt/sources.list
+++ b/apt/sources.list
@@ -5,20 +5,20 @@
 
 # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
 # newer versions of the distribution.
-deb http://asi-fs-n.contabo.net/ubuntu bionic main restricted
+deb http://asi-fs-n.contabo.net/ubuntu focal main restricted
 # deb-src http://asi-fs-n.contabo.net/ubuntu bionic main restricted
 
 ## Major bug fix updates produced after the final release of the
 ## distribution.
-deb http://asi-fs-n.contabo.net/ubuntu bionic-updates main restricted
+deb http://asi-fs-n.contabo.net/ubuntu focal-updates main restricted
 # deb-src http://asi-fs-n.contabo.net/ubuntu bionic-updates main restricted
 
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team. Also, please note that software in universe WILL NOT receive any
 ## review or updates from the Ubuntu security team.
-deb http://asi-fs-n.contabo.net/ubuntu bionic universe
+deb http://asi-fs-n.contabo.net/ubuntu focal universe
 # deb-src http://asi-fs-n.contabo.net/ubuntu bionic universe
-deb http://asi-fs-n.contabo.net/ubuntu bionic-updates universe
+deb http://asi-fs-n.contabo.net/ubuntu focal-updates universe
 # deb-src http://asi-fs-n.contabo.net/ubuntu bionic-updates universe
 
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu 
@@ -26,9 +26,9 @@ deb http://asi-fs-n.contabo.net/ubuntu bionic-updates universe
 ## your rights to use the software. Also, please note that software in 
 ## multiverse WILL NOT receive any review or updates from the Ubuntu
 ## security team.
-deb http://asi-fs-n.contabo.net/ubuntu bionic multiverse
+deb http://asi-fs-n.contabo.net/ubuntu focal multiverse
 # deb-src http://asi-fs-n.contabo.net/ubuntu bionic multiverse
-deb http://asi-fs-n.contabo.net/ubuntu bionic-updates multiverse
+deb http://asi-fs-n.contabo.net/ubuntu focal-updates multiverse
 # deb-src http://asi-fs-n.contabo.net/ubuntu bionic-updates multiverse
 
 ## N.B. software from this repository may not have been tested as
@@ -36,7 +36,7 @@ deb http://asi-fs-n.contabo.net/ubuntu bionic-updates multiverse
 ## newer versions of some applications which may provide useful features.
 ## Also, please note that software in backports WILL NOT receive any review
 ## or updates from the Ubuntu security team.
-deb http://asi-fs-n.contabo.net/ubuntu bionic-backports main restricted universe multiverse
+deb http://asi-fs-n.contabo.net/ubuntu focal-backports main restricted universe multiverse
 # deb-src http://asi-fs-n.contabo.net/ubuntu bionic-backports main restricted universe multiverse
 
 ## Uncomment the following two lines to add software from Canonical's
@@ -46,10 +46,10 @@ deb http://asi-fs-n.contabo.net/ubuntu bionic-backports main restricted universe
 # deb http://archive.canonical.com/ubuntu bionic partner
 # deb-src http://archive.canonical.com/ubuntu bionic partner
 
-deb http://security.ubuntu.com/ubuntu bionic-security main restricted
+deb http://security.ubuntu.com/ubuntu focal-security main restricted
 # deb-src http://security.ubuntu.com/ubuntu bionic-security main restricted
-deb http://security.ubuntu.com/ubuntu bionic-security universe
+deb http://security.ubuntu.com/ubuntu focal-security universe
 # deb-src http://security.ubuntu.com/ubuntu bionic-security universe
-deb http://security.ubuntu.com/ubuntu bionic-security multiverse
+deb http://security.ubuntu.com/ubuntu focal-security multiverse
 # deb-src http://security.ubuntu.com/ubuntu bionic-security multiverse
 deb https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-ubuntu1804 ./

diff --git a/apt/sources.list.bak b/apt/sources.list.bak
new file mode 100644 (file)
index 0000000..d44419f
--- /dev/null
+++ b/apt/sources.list.bak
@@ -0,0 +1,55 @@
+# deb http://asi-fs-n.contabo.net/ubuntu bionic main restricted
+
+# deb http://asi-fs-n.contabo.net/ubuntu bionic-updates main restricted
+# deb http://security.ubuntu.com/ubuntu bionic-security main restricted
+
+# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
+# newer versions of the distribution.
+deb http://asi-fs-n.contabo.net/ubuntu bionic main restricted
+# deb-src http://asi-fs-n.contabo.net/ubuntu bionic main restricted
+
+## Major bug fix updates produced after the final release of the
+## distribution.
+deb http://asi-fs-n.contabo.net/ubuntu bionic-updates main restricted
+# deb-src http://asi-fs-n.contabo.net/ubuntu bionic-updates main restricted
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+## team. Also, please note that software in universe WILL NOT receive any
+## review or updates from the Ubuntu security team.
+deb http://asi-fs-n.contabo.net/ubuntu bionic universe
+# deb-src http://asi-fs-n.contabo.net/ubuntu bionic universe
+deb http://asi-fs-n.contabo.net/ubuntu bionic-updates universe
+# deb-src http://asi-fs-n.contabo.net/ubuntu bionic-updates universe
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu 
+## team, and may not be under a free licence. Please satisfy yourself as to 
+## your rights to use the software. Also, please note that software in 
+## multiverse WILL NOT receive any review or updates from the Ubuntu
+## security team.
+deb http://asi-fs-n.contabo.net/ubuntu bionic multiverse
+# deb-src http://asi-fs-n.contabo.net/ubuntu bionic multiverse
+deb http://asi-fs-n.contabo.net/ubuntu bionic-updates multiverse
+# deb-src http://asi-fs-n.contabo.net/ubuntu bionic-updates multiverse
+
+## N.B. software from this repository may not have been tested as
+## extensively as that contained in the main release, although it includes
+## newer versions of some applications which may provide useful features.
+## Also, please note that software in backports WILL NOT receive any review
+## or updates from the Ubuntu security team.
+deb http://asi-fs-n.contabo.net/ubuntu bionic-backports main restricted universe multiverse
+# deb-src http://asi-fs-n.contabo.net/ubuntu bionic-backports main restricted universe multiverse
+
+## Uncomment the following two lines to add software from Canonical's
+## 'partner' repository.
+## This software is not part of Ubuntu, but is offered by Canonical and the
+## respective vendors as a service to Ubuntu users.
+# deb http://archive.canonical.com/ubuntu bionic partner
+# deb-src http://archive.canonical.com/ubuntu bionic partner
+
+deb http://security.ubuntu.com/ubuntu bionic-security main restricted
+# deb-src http://security.ubuntu.com/ubuntu bionic-security main restricted
+deb http://security.ubuntu.com/ubuntu bionic-security universe
+# deb-src http://security.ubuntu.com/ubuntu bionic-security universe
+deb http://security.ubuntu.com/ubuntu bionic-security multiverse
+# deb-src http://security.ubuntu.com/ubuntu bionic-security multiverse
+deb https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-ubuntu1804 ./

diff --git a/apt/sources.list.bak2 b/apt/sources.list.bak2
new file mode 100644 (file)
index 0000000..8c5211a
--- /dev/null
+++ b/apt/sources.list.bak2
@@ -0,0 +1,56 @@
+# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
+# newer versions of the distribution.
+deb http://us.archive.ubuntu.com/ubuntu/ bionic main restricted
+# deb-src http://us.archive.ubuntu.com/ubuntu/ bionic main restricted
+
+## Major bug fix updates produced after the final release of the
+## distribution.
+deb http://us.archive.ubuntu.com/ubuntu/ bionic-updates main restricted
+# deb-src http://us.archive.ubuntu.com/ubuntu/ bionic-updates main restricted
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+## team. Also, please note that software in universe WILL NOT receive any
+## review or updates from the Ubuntu security team.
+deb http://us.archive.ubuntu.com/ubuntu/ bionic universe
+# deb-src http://us.archive.ubuntu.com/ubuntu/ bionic universe
+deb http://us.archive.ubuntu.com/ubuntu/ bionic-updates universe
+# deb-src http://us.archive.ubuntu.com/ubuntu/ bionic-updates universe
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu 
+## team, and may not be under a free licence. Please satisfy yourself as to 
+## your rights to use the software. Also, please note that software in 
+## multiverse WILL NOT receive any review or updates from the Ubuntu
+## security team.
+deb http://us.archive.ubuntu.com/ubuntu/ bionic multiverse
+# deb-src http://us.archive.ubuntu.com/ubuntu/ bionic multiverse
+deb http://us.archive.ubuntu.com/ubuntu/ bionic-updates multiverse
+# deb-src http://us.archive.ubuntu.com/ubuntu/ bionic-updates multiverse
+
+## N.B. software from this repository may not have been tested as
+## extensively as that contained in the main release, although it includes
+## newer versions of some applications which may provide useful features.
+## Also, please note that software in backports WILL NOT receive any review
+## or updates from the Ubuntu security team.
+# deb http://us.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
+# deb-src http://us.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
+
+## Uncomment the following two lines to add software from Canonical's
+## 'partner' repository.
+## This software is not part of Ubuntu, but is offered by Canonical and the
+## respective vendors as a service to Ubuntu users.
+# deb http://archive.canonical.com/ubuntu bionic partner
+# deb-src http://archive.canonical.com/ubuntu bionic partner
+
+#deb http://security.ubuntu.com/ubuntu bionic-security main restricted
+# deb-src http://security.ubuntu.com/ubuntu bionic-security main restricted
+#deb http://security.ubuntu.com/ubuntu bionic-security universe
+# deb-src http://security.ubuntu.com/ubuntu bionic-security universe
+#deb http://security.ubuntu.com/ubuntu bionic-security multiverse
+# deb-src http://security.ubuntu.com/ubuntu bionic-security multiverse
+#deb http://security.ubuntu.com/ubuntu bionic-security main restricted
+# deb-src http://security.ubuntu.com/ubuntu bionic-security main restricted
+#deb http://security.ubuntu.com/ubuntu bionic-security universe
+# deb-src http://security.ubuntu.com/ubuntu bionic-security universe
+#deb http://security.ubuntu.com/ubuntu bionic-security multiverse
+# deb-src http://security.ubuntu.com/ubuntu bionic-security multiverse
+deb https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-ubuntu1804 ./

diff --git a/apt/sources.list.d/apache2.list b/apt/sources.list.d/apache2.list
index 320b77ed5703a14949b1e95a3c11eaafbc5b69a9..be5dfb848381e9540578f1f2259ac56a62bb890c 100644 (file)
--- a/apt/sources.list.d/apache2.list
+++ b/apt/sources.list.d/apache2.list
@@ -1,2 +1,2 @@
-deb http://ppa.launchpad.net/ondrej/apache2/ubuntu bionic main 
-deb-src http://ppa.launchpad.net/ondrej/apache2/ubuntu bionic main 
+deb http://ppa.launchpad.net/ondrej/apache2/ubuntu focal main
+deb-src http://ppa.launchpad.net/ondrej/apache2/ubuntu focal main

diff --git a/apt/sources.list.d/apache2.list.distUpgrade b/apt/sources.list.d/apache2.list.distUpgrade
new file mode 100644 (file)
index 0000000..320b77e
--- /dev/null
+++ b/apt/sources.list.d/apache2.list.distUpgrade
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/ondrej/apache2/ubuntu bionic main 
+deb-src http://ppa.launchpad.net/ondrej/apache2/ubuntu bionic main 

diff --git a/apt/sources.list.d/webmin.list.distUpgrade b/apt/sources.list.d/webmin.list.distUpgrade
new file mode 100644 (file)
index 0000000..7b1f58d
--- /dev/null
+++ b/apt/sources.list.d/webmin.list.distUpgrade
@@ -0,0 +1 @@
+deb http://download.webmin.com/download/repository sarge contrib

diff --git a/apt/sources.list.distUpgrade b/apt/sources.list.distUpgrade
new file mode 100644 (file)
index 0000000..d44419f
--- /dev/null
+++ b/apt/sources.list.distUpgrade
@@ -0,0 +1,55 @@
+# deb http://asi-fs-n.contabo.net/ubuntu bionic main restricted
+
+# deb http://asi-fs-n.contabo.net/ubuntu bionic-updates main restricted
+# deb http://security.ubuntu.com/ubuntu bionic-security main restricted
+
+# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
+# newer versions of the distribution.
+deb http://asi-fs-n.contabo.net/ubuntu bionic main restricted
+# deb-src http://asi-fs-n.contabo.net/ubuntu bionic main restricted
+
+## Major bug fix updates produced after the final release of the
+## distribution.
+deb http://asi-fs-n.contabo.net/ubuntu bionic-updates main restricted
+# deb-src http://asi-fs-n.contabo.net/ubuntu bionic-updates main restricted
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+## team. Also, please note that software in universe WILL NOT receive any
+## review or updates from the Ubuntu security team.
+deb http://asi-fs-n.contabo.net/ubuntu bionic universe
+# deb-src http://asi-fs-n.contabo.net/ubuntu bionic universe
+deb http://asi-fs-n.contabo.net/ubuntu bionic-updates universe
+# deb-src http://asi-fs-n.contabo.net/ubuntu bionic-updates universe
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu 
+## team, and may not be under a free licence. Please satisfy yourself as to 
+## your rights to use the software. Also, please note that software in 
+## multiverse WILL NOT receive any review or updates from the Ubuntu
+## security team.
+deb http://asi-fs-n.contabo.net/ubuntu bionic multiverse
+# deb-src http://asi-fs-n.contabo.net/ubuntu bionic multiverse
+deb http://asi-fs-n.contabo.net/ubuntu bionic-updates multiverse
+# deb-src http://asi-fs-n.contabo.net/ubuntu bionic-updates multiverse
+
+## N.B. software from this repository may not have been tested as
+## extensively as that contained in the main release, although it includes
+## newer versions of some applications which may provide useful features.
+## Also, please note that software in backports WILL NOT receive any review
+## or updates from the Ubuntu security team.
+deb http://asi-fs-n.contabo.net/ubuntu bionic-backports main restricted universe multiverse
+# deb-src http://asi-fs-n.contabo.net/ubuntu bionic-backports main restricted universe multiverse
+
+## Uncomment the following two lines to add software from Canonical's
+## 'partner' repository.
+## This software is not part of Ubuntu, but is offered by Canonical and the
+## respective vendors as a service to Ubuntu users.
+# deb http://archive.canonical.com/ubuntu bionic partner
+# deb-src http://archive.canonical.com/ubuntu bionic partner
+
+deb http://security.ubuntu.com/ubuntu bionic-security main restricted
+# deb-src http://security.ubuntu.com/ubuntu bionic-security main restricted
+deb http://security.ubuntu.com/ubuntu bionic-security universe
+# deb-src http://security.ubuntu.com/ubuntu bionic-security universe
+deb http://security.ubuntu.com/ubuntu bionic-security multiverse
+# deb-src http://security.ubuntu.com/ubuntu bionic-security multiverse
+deb https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-ubuntu1804 ./