diff --git a/protonvpn-stable-release-1.0.4-1.noarch.rpm b/protonvpn-stable-release-1.0.4-1.noarch.rpm new file mode 100644 index 0000000..fa14adb Binary files /dev/null and b/protonvpn-stable-release-1.0.4-1.noarch.rpm differ diff --git a/tasks/rpm.yml b/tasks/rpm.yml index 17340ca..adddfcd 100644 --- a/tasks/rpm.yml +++ b/tasks/rpm.yml @@ -10,14 +10,18 @@ dest: "/tmp/proton-pass-{{ proton_pass_version }}.x86_64.rpm" mode: "0644" timeout: 300 - when: "proton_pass_installed_result.rc != 0" + when: > + proton_pass_installed_result.stdout == '' or + 'proton-pass' not in proton_pass_installed_result.stdout - name: Install Proton Pass ansible.builtin.dnf: name: "/tmp/proton-pass-{{ proton_pass_version }}.x86_64.rpm" state: present disable_gpg_check: yes - when: "proton_pass_installed_result.rc != 0" + when: > + proton_pass_installed_result.stdout == '' or + 'proton-pass' not in proton_pass_installed_result.stdout - name: Stat Proton Authenticator installation ansible.builtin.command: rpm -qa proton-authenticator @@ -31,23 +35,64 @@ dest: "/tmp/proton-authenticator-{{ proton_authenticator_version }}.x86_64.rpm" mode: "0644" timeout: 300 - when: "proton_authenticator_installed_result.rc != 0" + when: > + proton_authenticator_installed_result.stdout == '' or + 'proton-authenticator' not in proton_authenticator_installed_result.stdout - name: Install Proton Authenticator ansible.builtin.dnf: name: "/tmp/proton-authenticator-{{ proton_authenticator_version }}.x86_64.rpm" state: present disable_gpg_check: yes - when: "proton_authenticator_installed_result.rc != 0" + when: > + proton_authenticator_installed_result.stdout == '' or + 'proton-authenticator' not in proton_authenticator_installed_result.stdout + +- name: Stat Proton Mail installation + ansible.builtin.command: rpm -qa proton-mail + register: proton_mail_installed_result + changed_when: false + failed_when: false + +- name: Download Proton Mail + ansible.builtin.get_url: + url: "https://proton.me/download/mail/linux/{{ proton_mail_version }}.rpm" + dest: "/tmp/proton-mail.rpm" + mode: "0644" + timeout: 300 + when: > + proton_mail_installed_result.stdout == '' or + 'proton-mail' not in proton_mail_installed_result.stdout + +- name: Install Proton mail + ansible.builtin.dnf: + name: "/tmp/proton-mail.rpm" + state: present + disable_gpg_check: yes + when: > + proton_mail_installed_result.stdout == '' or + 'proton-mail' not in proton_mail_installed_result.stdout - name: Delete Proton Pass downloaded RPM ansible.builtin.file: path: "/tmp/proton-pass-{{ proton_pass_version }}.x86_64.rpm" state: absent - when: "proton_pass_installed_result.rc != 0" + when: > + proton_pass_installed_result.stdout == '' or + 'proton-pass' not in proton_pass_installed_result.stdout - name: Delete Proton Authenticator downloaded RPM ansible.builtin.file: path: "/tmp/proton-authenticator-{{ proton_authenticator_version }}.x86_64.rpm" state: absent - when: "proton_authenticator_installed_result.rc != 0" + when: > + proton_authenticator_installed_result.stdout == '' or + 'proton-authenticator' not in proton_authenticator_installed_result.stdout + +- name: Delete Proton Mail downloaded RPM + ansible.builtin.file: + path: "/tmp/proton-mail.rpm" + state: absent + when: > + proton_mail_installed_result.stdout == '' or + 'proton-mail' not in proton_mail_installed_result.stdout diff --git a/vars.yml b/vars.yml index d7636f6..6adafc7 100644 --- a/vars.yml +++ b/vars.yml @@ -14,6 +14,7 @@ jdtls_download_retries: 3 jdtls_download_delay: 10 install_duckdb: true duckdb_version: "1.5.2" +proton_mail_version: "1.13.3/ProtonMail-desktop-beta" proton_pass_version: "1.37.0-1" proton_authenticator_version: "1.1.6-1"