finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use Ansible dig lookup instead of calling the dig program

Browse Source 
This means we no longer have a dependency on the `dig` program,
but we do have a dependency on `dnspython`.

Improves things as suggested in #65 (Github issue).
This commit is contained in:
Slavi Pantaleev 2019-01-08 10:19:45 +02:00
parent 65d4fe7e0c
commit f92c4d5a27
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
roles/matrix-server/tasks/self_check/self_check_dns.yml
View File

@ -1,24 +1,23 @@
--- ---
# This requires the dnspython library and will fail with a friendly error when unavailable.
- name: Check DNS SRV record - name: Check DNS SRV record
shell: set_fact:
cmd: "dig -t srv {{ ('_matrix._tcp.' + hostname_identity + '.')|quote }}" result_dig_srv: "{{ lookup('dig', ('_matrix._tcp.' + hostname_identity + './SRV'), 'flat=0', wantlist=False) }}"
register: result_dig_srv
changed_when: false
ignore_errors: true
- name: Fail if dig failed - name: Fail if DNS SRV record missing
fail: fail:
msg: "Failed checking DNS SRV record. You likely don't have the `dig` program installed locally. Full error: {{ result_dig_srv }}" msg: "It appears the DNS SRV record for {{ hostname_identity }} is not set up correctly (the record is missing). See the 'Configuring DNS' documentation for this playbook."
when: "result_dig_srv.stderr != ''" when: "result_dig_srv == 'NXDOMAIN'"
# We expect an answer like this:
# ;; ANSWER SECTION:
# _matrix._tcp.DOMAIN. 10800 IN SRV 10 0 8448 matrix.DOMAIN.
- name: Fail if DNS SRV record incorrect - name: Fail if DNS SRV record incorrect
fail: fail:
msg: "It appears the DNS SRV record for {{ hostname_identity }} is not set up correctly. See the 'Configuring DNS' documentation for this playbook. Full DNS answer was: {{ result_dig_srv.stdout }}" msg: >
when: "('8448 ' + hostname_matrix) not in result_dig_srv.stdout" It appears the DNS SRV record for {{ hostname_identity }} is not set up correctly.
Expected it to point to `{{ (hostname_matrix + '.') }}` (port 8448).
Found it pointing to `{{ result_dig_srv.target }}` (port {{ result_dig_srv.port }}).
See the 'Configuring DNS' documentation for this playbook.
when: "result_dig_srv.target != (hostname_matrix + '.') or result_dig_srv.port != 8448"
- name: Report correct DNS SRV record - name: Report correct DNS SRV record
debug: debug: