From: mhoellein Date: Tue, 23 Oct 2018 10:49:08 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to apt run X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=7860a71202f4f140454283cc7807e825d3c46d4f;p=homeserver saving uncommitted changes in /etc prior to apt run --- diff --git a/apache2/sites-available/collabora.conf b/apache2/sites-available/collabora.conf index 1b403e90..f1b1140e 100644 --- a/apache2/sites-available/collabora.conf +++ b/apache2/sites-available/collabora.conf @@ -1,5 +1,5 @@ - ServerName moellein.homeip.net:443 + ServerName collabora.moellein.homeip.net:443 ServerAlias collabora.moellein.homeip.net:443 #Options -Indexes diff --git a/apache2/sites-enabled/collabora.conf b/apache2/sites-enabled/collabora.conf deleted file mode 120000 index 60eba08e..00000000 --- a/apache2/sites-enabled/collabora.conf +++ /dev/null @@ -1 +0,0 @@ -../sites-available/collabora.conf \ No newline at end of file diff --git a/apt/sources.list.d/official-package-repositories.list b/apt/sources.list.d/official-package-repositories.list index 722b455e..ae8feadc 100644 --- a/apt/sources.list.d/official-package-repositories.list +++ b/apt/sources.list.d/official-package-repositories.list @@ -1,7 +1,6 @@ -# Do not edit this file manually, use Software Sources instead. +deb http://packages.linuxmint.com rosa main upstream import -deb http://packages.linuxmint.com rafaela main upstream import #id:linuxmint_main -deb http://extra.linuxmint.com rafaela main #id:linuxmint_extra +deb http://extra.linuxmint.com rosa main deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse