From 125fd4768e8d4495b3a20bdad930c9173b67ce79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Grondek?= <przemek@grondek.pl>
Date: Wed, 25 Oct 2023 23:59:18 +0200
Subject: [PATCH] Merge signal into desktop role

---
 localhost.yml                                        |  1 -
 roles/desktop/tasks/main.yml                         |  1 +
 .../tasks/ubuntu.yml => desktop/tasks/signal.yml}    | 12 ++++++++++--
 roles/signal/tasks/arch.yml                          |  5 -----
 roles/signal/tasks/main.yml                          |  6 ------
 5 files changed, 11 insertions(+), 14 deletions(-)
 rename roles/{signal/tasks/ubuntu.yml => desktop/tasks/signal.yml} (57%)
 delete mode 100644 roles/signal/tasks/arch.yml
 delete mode 100644 roles/signal/tasks/main.yml

diff --git a/localhost.yml b/localhost.yml
index df39de9..0c2efad 100644
--- a/localhost.yml
+++ b/localhost.yml
@@ -5,7 +5,6 @@
     - ubuntu
     - ubuntu-java
     - ubuntu-firefox
-    - signal
     - dotfiles
     - prusa-slicer
     - dev-java
diff --git a/roles/desktop/tasks/main.yml b/roles/desktop/tasks/main.yml
index e1d62a5..a29d814 100644
--- a/roles/desktop/tasks/main.yml
+++ b/roles/desktop/tasks/main.yml
@@ -6,5 +6,6 @@
   when: ansible_distribution == "Archlinux"
 
 - import_tasks: dotfiles.yml
+- import_tasks: signal.yml
 
 #- import_tasks: timekpr.yml
diff --git a/roles/signal/tasks/ubuntu.yml b/roles/desktop/tasks/signal.yml
similarity index 57%
rename from roles/signal/tasks/ubuntu.yml
rename to roles/desktop/tasks/signal.yml
index 10616ca..15dae06 100644
--- a/roles/signal/tasks/ubuntu.yml
+++ b/roles/desktop/tasks/signal.yml
@@ -1,7 +1,8 @@
 ---
 - become: yes
+  when: ansible_distribution == "Ubuntu"
   block:
-  - name: add signal gpg key
+  - name: add signal gpg key [Ubuntu[
     apt_key:
       url: https://updates.signal.org/desktop/apt/keys.asc
       state: present
@@ -16,4 +17,11 @@
     apt:
       update_cache: yes
       pkg:
-        - signal-desktop
\ No newline at end of file
+        - signal-desktop
+
+- name: install signal-desktop [Arch]
+  when: ansible_distribution == "Archlinux"
+  become: yes
+  community.general.pacman:
+    update_cache: yes
+    name: signal-desktop
diff --git a/roles/signal/tasks/arch.yml b/roles/signal/tasks/arch.yml
deleted file mode 100644
index 05c722a..0000000
--- a/roles/signal/tasks/arch.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- name: install signal-desktop
-  become: yes
-  community.general.pacman:
-    update_cache: yes
-    name: signal-desktop
diff --git a/roles/signal/tasks/main.yml b/roles/signal/tasks/main.yml
deleted file mode 100644
index 97284fc..0000000
--- a/roles/signal/tasks/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- import_tasks: ubuntu.yml
-  when: ansible_distribution == "Ubuntu"
-
-- import_tasks: arch.yml
-  when: ansible_distribution == "Archlinux"