From fb430da44c42abcdaabe8f62bb8f5df116d3e6ce Mon Sep 17 00:00:00 2001
From: Micke Nordin <hej@mic.ke>
Date: Mon, 13 Nov 2023 16:46:20 +0100
Subject: [PATCH] Switch to firefox

---
 playbooks/firefox.yaml         | 14 +++++++-------
 templates/librewolf.sources.j2 |  6 ------
 2 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 templates/librewolf.sources.j2

diff --git a/playbooks/firefox.yaml b/playbooks/firefox.yaml
index 99a0f4a..0646a06 100644
--- a/playbooks/firefox.yaml
+++ b/playbooks/firefox.yaml
@@ -4,8 +4,8 @@
   vars:
     uid: "{{ lookup('env','USER') }}"
     host_app_url: https://github.com/passff/passff-host/releases/latest/download/install_host_app.sh
-    key_path: /usr/share/keyrings/librewolf.gpg
-    key_url: https://deb.librewolf.net/keyring.gpg
+    key_path: /usr/share/keyrings/firefox.gpg
+    key_url: http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0xc77205f7194a3e1abe2df9a4b7b9c16f2667ca5c
   connection: local
   become: false
   tasks:
@@ -16,7 +16,7 @@
     - name: Get key
       ansible.builtin.command:
         chdir: /tmp
-        cmd: wget {{ key_url }}
+        cmd: wget -O ./keyring.gpg '{{ key_url }}'
         creates: /tmp/keyring.gpg
       when: not key.stat.exists
     - name: Dearmor key
@@ -29,8 +29,8 @@
     - name: install repo
       become: true
       ansible.builtin.template:
-        src: ../templates/librewolf.sources.j2
-        dest: /etc/apt/sources.list.d/librewolf.sources
+        src: ../templates/firefox.sources.j2
+        dest: /etc/apt/sources.list.d/firefox.sources
       when: not key.stat.exists
     - name: Install apt package
       become: true
@@ -38,7 +38,7 @@
         autoclean: true
         autoremove: true
         install_recommends: true
-        pkg: [librewolf]
+        pkg: [firefox-mozilla-build]
         state: latest
         update_cache: true
     - name: Get host app
@@ -49,7 +49,7 @@
       when: not key.stat.exists
     - name: Install host app
       ansible.builtin.command:
-        cmd: bash /tmp/install_host_app.sh librewolf
+        cmd: bash /tmp/install_host_app.sh firefox
       when: not key.stat.exists
     - name: Clean up
       ansible.builtin.command:
diff --git a/templates/librewolf.sources.j2 b/templates/librewolf.sources.j2
deleted file mode 100644
index b842cf8..0000000
--- a/templates/librewolf.sources.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-Types: deb
-URIs: https://deb.librewolf.net
-Suites: bullseye
-Components: main
-Architectures: amd64
-Signed-By: {{ key_path }}