saving uncommitted changes in /etc prior to apt run

diff --git a/apache2/sites-available/collabora.conf b/apache2/sites-available/collabora.conf
index 1b403e9040ba52a9ab504bbebea3c5df5c87cc92..f1b1140e6f3d3846877c1aabf2bb0af91090efdc 100644 (file)
--- a/apache2/sites-available/collabora.conf
+++ b/apache2/sites-available/collabora.conf
@@ -1,5 +1,5 @@
 <VirtualHost *:443>
-       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 (symlink)
index 60eba08..0000000
--- 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 722b455e9fae15fbb9b99ed3f82fc429510d0bdd..ae8feadca9af21146062a5b79b51859b2aa8cc36 100644 (file)
--- 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