diff options
| author | Aaron LI <aly@aaronly.me> | 2018-03-07 19:33:47 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2018-03-14 11:35:08 +0800 |
| commit | 14c6bdf87cea531aac2dac64c7fa77e4147f6a95 (patch) | |
| tree | 7901dfe35d6d7f604a1a67fd7e79aac2d216bbf1 /roles/dns | |
| parent | 9110251275632904a9aa20fda811ca3bde20ada2 (diff) | |
| download | ansible-dfly-vps-14c6bdf87cea531aac2dac64c7fa77e4147f6a95.tar.bz2 | |
dns/zones: update aaronly.me for dns switch; other minor updates
Diffstat (limited to 'roles/dns')
| -rw-r--r-- | roles/dns/templates/zones/1314233.xyz.zone.j2 | 3 | ||||
| -rw-r--r-- | roles/dns/templates/zones/233233.xyz.zone.j2 | 10 | ||||
| -rw-r--r-- | roles/dns/templates/zones/aaronly.me.zone.j2 | 6 | ||||
| -rw-r--r-- | roles/dns/templates/zones/liwt.net.zone.j2 | 9 |
4 files changed, 14 insertions, 14 deletions
diff --git a/roles/dns/templates/zones/1314233.xyz.zone.j2 b/roles/dns/templates/zones/1314233.xyz.zone.j2 index b309e67..bb8fc06 100644 --- a/roles/dns/templates/zones/1314233.xyz.zone.j2 +++ b/roles/dns/templates/zones/1314233.xyz.zone.j2 @@ -1,5 +1,6 @@ -{% set hostmaster = "hostmaster." + network.domain %} +; -*- mode: dns; -*- ; {{ ansible_managed }} +{% set hostmaster = "hostmaster." + network.domain %} $ORIGIN {{ domain }}. $TTL {{ dns.ttl }} diff --git a/roles/dns/templates/zones/233233.xyz.zone.j2 b/roles/dns/templates/zones/233233.xyz.zone.j2 index 21a414a..8001482 100644 --- a/roles/dns/templates/zones/233233.xyz.zone.j2 +++ b/roles/dns/templates/zones/233233.xyz.zone.j2 @@ -1,5 +1,6 @@ -{% set hostmaster = "hostmaster." + network.domain %} +; -*- mode: dns; -*- ; {{ ansible_managed }} +{% set hostmaster = "hostmaster." + network.domain %} $ORIGIN {{ domain }}. $TTL {{ dns.ttl }} @@ -20,9 +21,8 @@ $TTL {{ dns.ttl }} @ IN A {{ network.ipv4.address }} @ IN AAAA {{ network.ipv6.address }} -www IN CNAME @ -g IN CNAME @ -zw IN CNAME @ -* IN CNAME @ +{% for name in ["www", "g", "zw", "*"] %} +{{ name }} IN CNAME @ +{% endfor %} ; vim: set ft=bindzone: diff --git a/roles/dns/templates/zones/aaronly.me.zone.j2 b/roles/dns/templates/zones/aaronly.me.zone.j2 index 5a60d31..3b2f0d0 100644 --- a/roles/dns/templates/zones/aaronly.me.zone.j2 +++ b/roles/dns/templates/zones/aaronly.me.zone.j2 @@ -25,9 +25,11 @@ dorm-x42 IN A 58.196.142.84 office IN A 202.120.52.45 cluster IN A 202.120.52.63 liteserver IN A 5.2.70.218 +liteserver IN AAAA 2a04:52c0:101:55a::218 -www IN CNAME @ -* IN CNAME @ +{% for name in ["www", "g", "zw", "git", "carddav", "caldav"] %} +{{ name }} IN CNAME liteserver +{% endfor %} ; Mail server {% if domain != network.domain %} diff --git a/roles/dns/templates/zones/liwt.net.zone.j2 b/roles/dns/templates/zones/liwt.net.zone.j2 index bc74871..bbd7d14 100644 --- a/roles/dns/templates/zones/liwt.net.zone.j2 +++ b/roles/dns/templates/zones/liwt.net.zone.j2 @@ -34,12 +34,9 @@ $TTL {{ dns.ttl }} @ IN A {{ network.ipv4.address }} @ IN AAAA {{ network.ipv6.address }} -vultr IN CNAME @ -www IN CNAME @ -git IN CNAME @ -carddav IN CNAME @ -caldav IN CNAME @ -* IN CNAME @ +{% for name in ["vultr", "www", "git", "carddav", "caldav", "*"] %} +{{ name }} IN CNAME @ +{% endfor %} ; Mail server {% if domain == network.domain %} |