diff options
| author | Aaron LI <aly@aaronly.me> | 2018-03-04 18:45:12 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2018-03-14 11:35:08 +0800 |
| commit | 09ee3525a3671da0365fc48fc5947e3c276631d8 (patch) | |
| tree | 5ce95d6372b925e9781cebada1c09fbd30250110 | |
| parent | 442369be9cdfa8b1095d9fdd836355a1767aaa83 (diff) | |
| download | ansible-dfly-vps-09ee3525a3671da0365fc48fc5947e3c276631d8.tar.bz2 | |
dns/zones: use DNS SOA variables
| -rw-r--r-- | host_vars/vultr | 7 | ||||
| -rw-r--r-- | roles/dns/templates/zones/1314233.xyz.zone.j2 | 11 | ||||
| -rw-r--r-- | roles/dns/templates/zones/233233.xyz.zone.j2 | 11 | ||||
| -rw-r--r-- | roles/dns/templates/zones/aaronly.me.zone.j2 | 11 | ||||
| -rw-r--r-- | roles/dns/templates/zones/liwt.net.zone.j2 | 11 |
5 files changed, 27 insertions, 24 deletions
diff --git a/host_vars/vultr b/host_vars/vultr index 7890d85..16021f4 100644 --- a/host_vars/vultr +++ b/host_vars/vultr @@ -31,6 +31,13 @@ domains: sub: - www +dns: + ttl: 1h + refresh: 10800 + retry: 1800 + expire: 4w + minimum: 1d + nameservers: - name: afraid xfr_ip: 174.37.196.55 diff --git a/roles/dns/templates/zones/1314233.xyz.zone.j2 b/roles/dns/templates/zones/1314233.xyz.zone.j2 index 5511c6e..b309e67 100644 --- a/roles/dns/templates/zones/1314233.xyz.zone.j2 +++ b/roles/dns/templates/zones/1314233.xyz.zone.j2 @@ -1,15 +1,14 @@ -{% set domain = "1314233.xyz" %} {% set hostmaster = "hostmaster." + network.domain %} ; {{ ansible_managed }} $ORIGIN {{ domain }}. -$TTL 1h +$TTL {{ dns.ttl }} @ IN SOA {{ nameservers[0].ns[0] }}. {{ hostmaster }}. ( {{ domain | next_serial }} ; serial number - 1d ; refresh - 2h ; retry - 4w ; expire - 1h ; minimum TTL + {{ dns.refresh }} ; refresh + {{ dns.retry }} ; retry + {{ dns.expire }} ; expire + {{ dns.minimum }} ; minimum ) {% for server in nameservers %} diff --git a/roles/dns/templates/zones/233233.xyz.zone.j2 b/roles/dns/templates/zones/233233.xyz.zone.j2 index 4067cea..21a414a 100644 --- a/roles/dns/templates/zones/233233.xyz.zone.j2 +++ b/roles/dns/templates/zones/233233.xyz.zone.j2 @@ -1,15 +1,14 @@ -{% set domain = "233233.xyz" %} {% set hostmaster = "hostmaster." + network.domain %} ; {{ ansible_managed }} $ORIGIN {{ domain }}. -$TTL 1h +$TTL {{ dns.ttl }} @ IN SOA {{ nameservers[0].ns[0] }}. {{ hostmaster }}. ( {{ domain | next_serial }} ; serial number - 1d ; refresh - 2h ; retry - 4w ; expire - 1h ; minimum TTL + {{ dns.refresh }} ; refresh + {{ dns.retry }} ; retry + {{ dns.expire }} ; expire + {{ dns.minimum }} ; minimum ) {% for server in nameservers %} diff --git a/roles/dns/templates/zones/aaronly.me.zone.j2 b/roles/dns/templates/zones/aaronly.me.zone.j2 index 724f1f0..5a60d31 100644 --- a/roles/dns/templates/zones/aaronly.me.zone.j2 +++ b/roles/dns/templates/zones/aaronly.me.zone.j2 @@ -1,16 +1,15 @@ ; -*- mode: dns; -*- ; {{ ansible_managed }} -{% set domain = "aaronly.me" %} {% set hostmaster = "hostmaster." + network.domain %} $ORIGIN {{ domain }}. -$TTL 1h +$TTL {{ dns.ttl }} @ IN SOA {{ nameservers[0].ns[0] }}. {{ hostmaster }}. ( {{ domain | next_serial }} ; serial number - 1d ; refresh - 2h ; retry - 4w ; expire - 1h ; minimum + {{ dns.refresh }} ; refresh + {{ dns.retry }} ; retry + {{ dns.expire }} ; expire + {{ dns.minimum }} ; minimum ) ; Name servers diff --git a/roles/dns/templates/zones/liwt.net.zone.j2 b/roles/dns/templates/zones/liwt.net.zone.j2 index 1eabb77..bc74871 100644 --- a/roles/dns/templates/zones/liwt.net.zone.j2 +++ b/roles/dns/templates/zones/liwt.net.zone.j2 @@ -1,9 +1,8 @@ ; -*- mode: dns; -*- ; {{ ansible_managed }} -{% set domain = "liwt.net" %} {% set hostmaster = "hostmaster." + network.domain %} $ORIGIN {{ domain }}. -$TTL 1h +$TTL {{ dns.ttl }} ; WARNING: ; @@ -19,10 +18,10 @@ $TTL 1h @ IN SOA {{ nameservers[0].ns[0] }}. {{ hostmaster }}. ( {{ domain | next_serial }} ; serial number - 1d ; refresh - 2h ; retry - 4w ; expire - 1h ; minimum + {{ dns.refresh }} ; refresh + {{ dns.retry }} ; retry + {{ dns.expire }} ; expire + {{ dns.minimum }} ; minimum ) ; Name servers |