diff options
| author | Aaron LI <aly@aaronly.me> | 2018-04-09 15:02:09 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2018-04-09 15:02:29 +0800 |
| commit | 50866de332539350b3d7184d6e7606b171aca8f4 (patch) | |
| tree | 5ca5de3cb0cbe50557a5261233cb356f76484cc1 | |
| parent | eea81116581bcb7b515f079637d898e12558126f (diff) | |
| download | ansible-dfly-vps-50866de332539350b3d7184d6e7606b171aca8f4.tar.bz2 | |
dns/zones: use dav to replace {card,cal}dav; clean aaronly.me
| -rw-r--r-- | roles/dns/templates/zones/aaronly.me.zone.j2 | 6 | ||||
| -rw-r--r-- | roles/dns/templates/zones/liwt.net.zone.j2 | 2 | ||||
| -rw-r--r-- | roles/web/templates/sites/liwt.radicale.conf.j2 | 4 |
3 files changed, 4 insertions, 8 deletions
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 %} diff --git a/roles/web/templates/sites/liwt.radicale.conf.j2 b/roles/web/templates/sites/liwt.radicale.conf.j2 index 416a872..2822fb8 100644 --- a/roles/web/templates/sites/liwt.radicale.conf.j2 +++ b/roles/web/templates/sites/liwt.radicale.conf.j2 @@ -1,7 +1,7 @@ {% set domain = "liwt.net" %} # # nginx/sites: aaronly.radicale.conf -# CalDAV/CardDAV server: caldav.{{ domain }}, carddav.{{ domain }} +# CalDAV/CardDAV server: dav.{{ domain }} # # Aaron LI # 2017-04-27 @@ -11,7 +11,7 @@ server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name caldav.{{ domain }} carddav.{{ domain }}; + server_name dav.{{ domain }}; # SSL/TLS Certificate kindly provided by Let's Encrypt ssl_certificate /usr/local/etc/ssl/acme/{{ domain }}/fullchain.pem; |