From 50866de332539350b3d7184d6e7606b171aca8f4 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Mon, 9 Apr 2018 15:02:09 +0800 Subject: dns/zones: use dav to replace {card,cal}dav; clean aaronly.me --- roles/dns/templates/zones/aaronly.me.zone.j2 | 6 +----- roles/dns/templates/zones/liwt.net.zone.j2 | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'roles/dns/templates/zones') diff --git a/roles/dns/templates/zones/aaronly.me.zone.j2 b/roles/dns/templates/zones/aaronly.me.zone.j2 index 6b53d4d..b43b1ae 100644 --- a/roles/dns/templates/zones/aaronly.me.zone.j2 +++ b/roles/dns/templates/zones/aaronly.me.zone.j2 @@ -24,12 +24,8 @@ $TTL {{ dns.ttl }} 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 -{% for name in ["www", "code", "g", "zw", "git", "carddav", "caldav"] %} -{{ name }} IN CNAME liteserver -{% endfor %} +* IN CNAME @ ; 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 2466afe..b49c76f 100644 --- a/roles/dns/templates/zones/liwt.net.zone.j2 +++ b/roles/dns/templates/zones/liwt.net.zone.j2 @@ -34,7 +34,7 @@ $TTL {{ dns.ttl }} @ IN A {{ network.ipv4.address }} @ IN AAAA {{ network.ipv6.address }} -{% for name in ["vultr", "www", "git", "carddav", "caldav", "*"] %} +{% for name in ["vultr", "www", "git", "dav", "*"] %} {{ name }} IN CNAME @ {% endfor %} -- cgit v1.2.2