From 0a8b7771804866dbf10cad244e25009a66c4b731 Mon Sep 17 00:00:00 2001
From: Thomas Schneider <thomas@fsmpi.rwth-aachen.de>
Date: Tue, 27 Jun 2017 17:13:24 +0200
Subject: [PATCH] Remove old firefox repos

Also, replace the old packages by the current ones (the old ones would
still work as transitional, but better do it now).

Signed-off-by: Thomas Schneider <thomas@fsmpi.rwth-aachen.de>
---
 client/tasks/desktop.yml | 8 ++++----
 client/tasks/mozilla.yml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/tasks/desktop.yml b/client/tasks/desktop.yml
index 13d44b0..e2de7cd 100644
--- a/client/tasks/desktop.yml
+++ b/client/tasks/desktop.yml
@@ -84,10 +84,10 @@
 - name: ensure internet applications are installed
   apt: name={{ item }} state=latest
   with_items:
-    - icedove
-    - iceweasel
-    - iceowl-extension
-    - icedove-quotecolors
+    - thunderbird
+    - firefox-esr
+    - lightning
+    - xul-ext-quotecolors
     - enigmail
     - chromium
     - chromium-l10n
diff --git a/client/tasks/mozilla.yml b/client/tasks/mozilla.yml
index c543276..0867fbd 100644
--- a/client/tasks/mozilla.yml
+++ b/client/tasks/mozilla.yml
@@ -15,8 +15,8 @@
     - repo
     - clean
 
-- name: ensure firefox-release repository is used
-  apt_repository: repo='deb http://mozilla.debian.net/ jessie-backports firefox-release' state=present
+- name: ensure firefox-release repository is not used anymore
+  apt_repository: repo='deb http://mozilla.debian.net/ jessie-backports firefox-release' state=absent
   tags:
     - packages
     - repo
-- 
GitLab