mail: fix mailctl dependency and remove mail-oauth group

dezeroku · May 2, 2024 · f5677b4 · f5677b4
1 parent e92dccd
commit f5677b4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/playbooks/mail.yml b/playbooks/mail.yml
@@ -8,19 +8,9 @@
     - {role: imapnotify, tags: ['imapnotify']}
     - {role: isync, tags: ['isync']}
     - {role: msmtp, tags: ['msmtp']}
+    - {role: mailctl, tags: ['mailctl'], when: 'email_client | dict2items | selectattr("value.oauth", "defined") | selectattr("value.oauth", "equalto", true) | list | items2dict'}
   tags:
     - mail
-    - mail-oauth
-    - never
-
-- name: Mail (with XOAUTH2 support)
-  hosts: all
-  become: true
-  become_user: "{{ user_name }}"
-  roles:
-    - {role: mailctl, tags: ['mailctl']}
-  tags:
-    - mail-oauth
     - never
 
 - name: Mail PIM

diff --git a/roles/imapnotify/meta/main.yaml b/roles/imapnotify/meta/main.yaml
@@ -1,3 +1,4 @@
 ---
 dependencies:
   - role: isync
+  - {role: mailctl, when: 'email_client | dict2items | selectattr("value.oauth", "defined") | selectattr("value.oauth", "equalto", true) | list | items2dict'}
diff --git a/roles/isync/meta/main.yaml b/roles/isync/meta/main.yaml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - {role: mailctl, when: 'email_client | dict2items | selectattr("value.oauth", "defined") | selectattr("value.oauth", "equalto", true) | list | items2dict'}
diff --git a/roles/msmtp/meta/main.yaml b/roles/msmtp/meta/main.yaml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - {role: mailctl, when: 'email_client | dict2items | selectattr("value.oauth", "defined") | selectattr("value.oauth", "equalto", true) | list | items2dict'}
diff --git a/roles/vdirsyncer/meta/main.yaml b/roles/vdirsyncer/meta/main.yaml
@@ -1,3 +1,3 @@
 ---
 dependencies:
-  - role: mailctl
+  - {role: mailctl, when: 'email_client | dict2items | selectattr("value.google", "defined") | selectattr("value.google", "equalto", true) | list | items2dict'}