From: mhoellein <mhoellein@homeserver.homeip.net>
Date: Tue, 23 Oct 2018 12:44:48 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to apt run
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=9019d3b653cc225432041b707e645df485f89fb5;p=homeserver

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

diff --git a/.etckeeper b/.etckeeper
index b4c57160..03bdabf8 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -708,17 +708,7 @@ maybe chmod 0644 './apt/preferences.d/official-extra-repositories.pref'
 maybe chmod 0644 './apt/preferences.d/official-package-repositories.pref'
 maybe chmod 0664 './apt/sources.list'
 maybe chmod 0755 './apt/sources.list.d'
-maybe chmod 0644 './apt/sources.list.d/certbot-certbot-trusty.list'
-maybe chmod 0644 './apt/sources.list.d/devolo-updates.list'
-maybe chmod 0644 './apt/sources.list.d/docker.list'
-maybe chmod 0644 './apt/sources.list.d/formorer-icinga-trusty.list'
-maybe chmod 0644 './apt/sources.list.d/getdeb.list'
-maybe chmod 0644 './apt/sources.list.d/mc3man-trusty-media-trusty.list'
-maybe chmod 0644 './apt/sources.list.d/nodesource.list'
 maybe chmod 0644 './apt/sources.list.d/official-package-repositories.list'
-maybe chmod 0644 './apt/sources.list.d/ondrej-php-trusty.list'
-maybe chmod 0644 './apt/sources.list.d/team-xbmc-ppa-trusty.list'
-maybe chmod 0644 './apt/sources.list.d/x2go-stable-trusty.list'
 maybe chmod 0600 './apt/trustdb.gpg'
 maybe chmod 0644 './apt/trusted.gpg'
 maybe chmod 0755 './apt/trusted.gpg.d'
diff --git a/apt/sources.list b/apt/sources.list
index 9a57af78..e69de29b 100644
--- a/apt/sources.list
+++ b/apt/sources.list
@@ -1 +0,0 @@
-#deb cdrom:[Linux Mint 17.2 _Rafaela_ - Release amd64 20150721]/ trusty contrib main non-free
diff --git a/apt/sources.list.d/certbot-certbot-trusty.list b/apt/sources.list.d/certbot-certbot-trusty.list
deleted file mode 100644
index ba8bfd44..00000000
--- a/apt/sources.list.d/certbot-certbot-trusty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/certbot/certbot/ubuntu trusty main
-deb-src http://ppa.launchpad.net/certbot/certbot/ubuntu trusty main
diff --git a/apt/sources.list.d/devolo-updates.list b/apt/sources.list.d/devolo-updates.list
deleted file mode 100644
index 781ccb22..00000000
--- a/apt/sources.list.d/devolo-updates.list
+++ /dev/null
@@ -1,7 +0,0 @@
-### THIS FILE IS AUTOMATICALLY CONFIGURED ###
-# You may comment out this entry, but any other modifications may be lost.
-# In particular, do not add a comment behind the entry on the same line,
-# because that's what the Ubuntu Upgrade Managaer does when disabling all 
-# third-party repositories and that would cause this entry to be re-enabled.
-# See /etc/cron.daily/devolo-updates for more details.
-deb http://update.devolo.com/linux/apt/ stable main
diff --git a/apt/sources.list.d/docker.list b/apt/sources.list.d/docker.list
deleted file mode 100644
index 8d29620b..00000000
--- a/apt/sources.list.d/docker.list
+++ /dev/null
@@ -1 +0,0 @@
-deb https://apt.dockerproject.org/repo ubuntu-trusty main
diff --git a/apt/sources.list.d/formorer-icinga-trusty.list b/apt/sources.list.d/formorer-icinga-trusty.list
deleted file mode 100644
index 2025ffac..00000000
--- a/apt/sources.list.d/formorer-icinga-trusty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/formorer/icinga/ubuntu trusty main
-deb-src http://ppa.launchpad.net/formorer/icinga/ubuntu trusty main
diff --git a/apt/sources.list.d/getdeb.list b/apt/sources.list.d/getdeb.list
deleted file mode 100644
index 503efee7..00000000
--- a/apt/sources.list.d/getdeb.list
+++ /dev/null
@@ -1 +0,0 @@
-# deb http://archive.getdeb.net/ubuntu trusty-getdeb apps 
diff --git a/apt/sources.list.d/mc3man-trusty-media-trusty.list b/apt/sources.list.d/mc3man-trusty-media-trusty.list
deleted file mode 100644
index 3d9f9de7..00000000
--- a/apt/sources.list.d/mc3man-trusty-media-trusty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/mc3man/trusty-media/ubuntu trusty main
-deb-src http://ppa.launchpad.net/mc3man/trusty-media/ubuntu trusty main
diff --git a/apt/sources.list.d/nodesource.list b/apt/sources.list.d/nodesource.list
deleted file mode 100644
index 32a97c90..00000000
--- a/apt/sources.list.d/nodesource.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb https://deb.nodesource.com/node_4.x trusty main
-deb-src https://deb.nodesource.com/node_4.x trusty main
diff --git a/apt/sources.list.d/official-package-repositories.list b/apt/sources.list.d/official-package-repositories.list
index ae8feadc..bf9214c4 100644
--- a/apt/sources.list.d/official-package-repositories.list
+++ b/apt/sources.list.d/official-package-repositories.list
@@ -1,9 +1,8 @@
-deb http://packages.linuxmint.com rosa main upstream import
+deb http://packages.linuxmint.com sarah main upstream import backport 
 
-deb http://extra.linuxmint.com rosa main
+deb http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu xenial-backports main restricted universe multiverse
 
-deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse
-deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse
-
-deb http://security.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse
-deb http://archive.canonical.com/ubuntu/ trusty partner
+deb http://security.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse
+deb http://archive.canonical.com/ubuntu/ xenial partner
diff --git a/apt/sources.list.d/ondrej-php-trusty.list b/apt/sources.list.d/ondrej-php-trusty.list
deleted file mode 100644
index 4b755fd9..00000000
--- a/apt/sources.list.d/ondrej-php-trusty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/ondrej/php/ubuntu trusty main
-deb-src http://ppa.launchpad.net/ondrej/php/ubuntu trusty main
diff --git a/apt/sources.list.d/team-xbmc-ppa-trusty.list b/apt/sources.list.d/team-xbmc-ppa-trusty.list
deleted file mode 100644
index f3d5c93c..00000000
--- a/apt/sources.list.d/team-xbmc-ppa-trusty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/team-xbmc/ppa/ubuntu trusty main
-deb-src http://ppa.launchpad.net/team-xbmc/ppa/ubuntu trusty main
diff --git a/apt/sources.list.d/x2go-stable-trusty.list b/apt/sources.list.d/x2go-stable-trusty.list
deleted file mode 100644
index ec44daab..00000000
--- a/apt/sources.list.d/x2go-stable-trusty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/x2go/stable/ubuntu trusty main
-deb-src http://ppa.launchpad.net/x2go/stable/ubuntu trusty main
diff --git a/apt/trusted.gpg b/apt/trusted.gpg
index 77113a99..36fcd891 100644
Binary files a/apt/trusted.gpg and b/apt/trusted.gpg differ