summaryrefslogtreecommitdiff
path: root/playbook.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'playbook.yaml')
-rw-r--r--playbook.yaml34
1 files changed, 12 insertions, 22 deletions
diff --git a/playbook.yaml b/playbook.yaml
index 2a2912b..7084f60 100644
--- a/playbook.yaml
+++ b/playbook.yaml
@@ -146,24 +146,24 @@
- subname: "conference"
type: CNAME
ttl: 3600
- records: ["{{ delegate_host }}."]
+ records: ["chat.{{ virtual_host }}."]
- subname: "upload"
type: CNAME
ttl: 3600
- records: ["{{ delegate_host }}."]
+ records: ["chat.{{ virtual_host }}."]
- subname: "_xmpp-client._tcp"
type: SRV
ttl: 3600
- records: ["0 5 5222 {{ delegate_host }}."]
+ records: ["0 5 5222 chat.{{ virtual_host }}."]
- subname: "_xmpps-client._tcp"
type: SRV
ttl: 3600
- records: ["0 5 5223 {{ delegate_host }}."]
- - subname: '{{ "_5222._tcp" + tlsa_appended_subdomain }}'
+ records: ["0 5 5223 chat.{{ virtual_host }}."]
+ - subname: "_5222._tcp.chat"
type: TLSA
ttl: 3600
records: ["3 1 1 {{ dane_hash.stdout }}"]
- - subname: '{{ "_5223._tcp" + tlsa_appended_subdomain }}'
+ - subname: "_5223._tcp.chat"
type: TLSA
ttl: 3600
records: ["3 1 1 {{ dane_hash.stdout }}"]
@@ -180,24 +180,24 @@
- subname: "_xmpp-server._tcp"
type: SRV
ttl: 3600
- records: ["0 5 5269 {{ delegate_host }}."]
+ records: ["0 5 5269 chat.{{ virtual_host }}."]
- subname: "_xmpps-server._tcp"
type: SRV
ttl: 3600
- records: ["0 5 5270 {{ delegate_host }}."]
+ records: ["0 5 5270 chat.{{ virtual_host }}."]
- subname: "_xmpps-server._tcp.upload"
type: SRV
ttl: 3600
- records: ["0 5 5270 {{ delegate_host }}."]
+ records: ["0 5 5270 chat.{{ virtual_host }}."]
- subname: "_xmpps-server._tcp.conference"
type: SRV
ttl: 3600
- records: ["0 5 5270 {{ delegate_host }}."]
- - subname: '{{ "_5269._tcp" + tlsa_appended_subdomain }}'
+ records: ["0 5 5270 chat.{{ virtual_host }}."]
+ - subname: "_5269._tcp.chat"
type: TLSA
ttl: 3600
records: ["3 1 1 {{ dane_hash.stdout }}"]
- - subname: '{{ "_5270._tcp" + tlsa_appended_subdomain }}'
+ - subname: "_5270._tcp.chat"
type: TLSA
ttl: 3600
records: ["3 1 1 {{ dane_hash.stdout }}"]
@@ -547,13 +547,3 @@
# If virtual_host is "continuous.nonprod.example.org", then ds_subname is
# "continuous.nonprod".
ds_subname: "{{ virtual_host | regex_replace('.' + domain_with_ds, '') }}"
-
- delegate_host: >-
- {{- virtual_host
- if delegate_prefix == ""
- else delegate_prefix + "." + virtual_host -}}
-
- tlsa_appended_subdomain: >-
- {{- ""
- if delegate_prefix == ""
- else "." + delegate_prefix -}}