mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-10-21 13:36:39 +00:00
Solved mailu token bug
This commit is contained in:
@@ -17,12 +17,12 @@ server:
|
||||
csp:
|
||||
flags:
|
||||
style-src:
|
||||
unsafe-inline: true
|
||||
unsafe-inline: true
|
||||
script-src-elem:
|
||||
unsafe-inline: true
|
||||
unsafe-inline: true
|
||||
script-src:
|
||||
unsafe-inline: true
|
||||
unsafe-eval: true
|
||||
unsafe-inline: true
|
||||
unsafe-eval: true
|
||||
rbac:
|
||||
roles:
|
||||
mail-bot:
|
||||
|
@@ -55,7 +55,8 @@
|
||||
mailu_user_key: "{{ item.key }}"
|
||||
mailu_user_name: "{{ item.value.username }}"
|
||||
mailu_password: "{{ item.value.password }}"
|
||||
mailu_token_ip: "{{ item.value.ip | default('') }}"
|
||||
mailu_token_ip: "{{ item.value.ip | default(networks.internet.ip4) }}"
|
||||
mailu_token_name: "{{ SOFTWARE_NAME ~ ' Token for ' ~ item.value.username }}"
|
||||
loop: "{{ users | dict2items }}"
|
||||
loop_control:
|
||||
loop_var: item
|
||||
@@ -66,3 +67,5 @@
|
||||
|
||||
- name: Set Mailu DNS records
|
||||
include_tasks: 05_dns-records.yml
|
||||
|
||||
- include_tasks: utils/run_once.yml
|
@@ -17,7 +17,7 @@
|
||||
mailu_tokens_cli.stdout
|
||||
| default('[]')
|
||||
| from_json
|
||||
| selectattr('comment','equalto', SOFTWARE_NAME)
|
||||
| selectattr('comment','equalto', mailu_token_name)
|
||||
| list
|
||||
).0 | default(None) }}
|
||||
|
||||
|
@@ -19,7 +19,7 @@
|
||||
-H "Authorization: Bearer {{ MAILU_API_TOKEN }}"
|
||||
-H "Content-Type: application/json"
|
||||
-d '{{ {
|
||||
"comment": SOFTWARE_NAME,
|
||||
"comment": mailu_token_name,
|
||||
"email": users[mailu_user_key].email,
|
||||
"ip": mailu_token_ip
|
||||
} | to_json }}'
|
||||
|
@@ -1,5 +1,3 @@
|
||||
---
|
||||
- block:
|
||||
- include_tasks: 01_core.yml
|
||||
- include_tasks: utils/run_once.yml
|
||||
- include_tasks: 01_core.yml
|
||||
when: run_once_web_app_mailu is not defined
|
Reference in New Issue
Block a user