From 82cc42275641f4bbc59be28401cbd2eda860564e Mon Sep 17 00:00:00 2001 From: Ryan Orlando Date: Sun, 21 Jul 2024 13:14:22 -0700 Subject: [PATCH] stuff --- roles/nicotine/tasks/main.yml | 25 +++++++++++++++++++++++++ roles/nicotine/vars/main.yml | 1 + roles/pkg/vars/main.yml | 2 -- roles/signal/tasks/main.yml | 26 ++++++++++++++++++++++++++ roles/signal/vars/main.yml | 1 + workstation.yml | 6 ++++++ 6 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 roles/nicotine/tasks/main.yml create mode 100644 roles/nicotine/vars/main.yml create mode 100644 roles/signal/tasks/main.yml create mode 100644 roles/signal/vars/main.yml diff --git a/roles/nicotine/tasks/main.yml b/roles/nicotine/tasks/main.yml new file mode 100644 index 0000000..fb179e7 --- /dev/null +++ b/roles/nicotine/tasks/main.yml @@ -0,0 +1,25 @@ +--- +- name: Update apt cache + apt: + update_cache: yes + +- name: Install required packages + apt: + name: + - python3-launchpadlib + - software-properties-common + state: present + +- name: Add Nicotine+ PPA repository + apt_repository: + repo: 'ppa:nicotine-team/stable' + state: present + +- name: Update apt cache again + apt: + update_cache: yes + +- name: Install Nicotine+ + apt: + name: nicotine + state: present diff --git a/roles/nicotine/vars/main.yml b/roles/nicotine/vars/main.yml new file mode 100644 index 0000000..ed97d53 --- /dev/null +++ b/roles/nicotine/vars/main.yml @@ -0,0 +1 @@ +--- diff --git a/roles/pkg/vars/main.yml b/roles/pkg/vars/main.yml index 8a610e1..912d766 100644 --- a/roles/pkg/vars/main.yml +++ b/roles/pkg/vars/main.yml @@ -93,8 +93,6 @@ ui_packages: - fonts-hack flatpak_packages: - - org.nicotine_plus.Nicotine - - org.signal.Signal - net.ankiweb.Anki - org.torproject.torbrowser-launcher diff --git a/roles/signal/tasks/main.yml b/roles/signal/tasks/main.yml new file mode 100644 index 0000000..aee0957 --- /dev/null +++ b/roles/signal/tasks/main.yml @@ -0,0 +1,26 @@ +--- +- name: Download and convert Signal public software signing key + shell: | + wget -O- https://updates.signal.org/desktop/apt/keys.asc | gpg --dearmor -o /tmp/signal-desktop-keyring.gpg + args: + creates: /tmp/signal-desktop-keyring.gpg + +- name: Move gpg key to apt keyring directory + copy: + src: /tmp/signal-desktop-keyring.gpg + dest: /usr/share/keyrings/signal-desktop-keyring.gpg + remote_src: yes + +- name: Add Signal repository + copy: + content: "deb [arch=amd64 signed-by=/usr/share/keyrings/signal-desktop-keyring.gpg] https://updates.signal.org/desktop/apt xenial main\n" + dest: /etc/apt/sources.list.d/signal-xenial.list + +- name: Update apt cache + apt: + update_cache: yes + +- name: Install Signal Desktop + apt: + name: signal-desktop + state: present diff --git a/roles/signal/vars/main.yml b/roles/signal/vars/main.yml new file mode 100644 index 0000000..ed97d53 --- /dev/null +++ b/roles/signal/vars/main.yml @@ -0,0 +1 @@ +--- diff --git a/workstation.yml b/workstation.yml index 84a3f01..c67fa2e 100644 --- a/workstation.yml +++ b/workstation.yml @@ -29,3 +29,9 @@ - role: brave tags: brave_tag + + - role: signal + tags: signal_tag + + - role: nicotine + tags: nicotine_tag