From 382d704be2b9ef82382e6ba33479ac3a30506dc5 Mon Sep 17 00:00:00 2001 From: Grant Date: Wed, 8 Dec 2021 14:12:31 +0000 Subject: [PATCH] Update README.md Correct / improve the descriptions of the steps used. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0eec140..95cbcb8 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ OpenStreetMap DNS ====================================== -This repository contains the DNS zone file templates and related code for managing OpenStreetMap.org and other domain names DNS. The full list of domains are in the [dnsconfig.js](dnsconfig.js) file. +This repository contains the DNS zone templates and related code for managing OpenStreetMap.org and other domain names. The full list of domains managed by this repo are in the [dnsconfig.js](dnsconfig.js) file. ## Standard DNS Zone Files -We use [dnscontrol](https://stackexchange.github.io/dnscontrol/) to manage the DNS zones. We have a few wrapper scripts which are called from the [Makefile](Makefile) +We use [dnscontrol](https://stackexchange.github.io/dnscontrol/) to manage OpenStreetMap DNS. A set of wrapper scripts are used, which are called from the [Makefile](Makefile) -On a repo commit, a git [post-receive](https://github.com/openstreetmap/chef/blob/master/cookbooks/dns/files/default/post-receive) runs `make update` via a [script](https://github.com/openstreetmap/chef/blob/master/cookbooks/dns/templates/default/dns-update.erb) which then pushes the updates the DNS zones on the authoritative DNS nameservers. +Merges to the master branch trigger a git [post-receive](https://github.com/openstreetmap/chef/blob/master/cookbooks/dns/files/default/post-receive) which runs `make update` via a [script](https://github.com/openstreetmap/chef/blob/master/cookbooks/dns/templates/default/dns-update.erb), the DNS is then updated by dnscontrol. ## GeoDNS Zones -For GeoDNS zones we use [gdnsd](https://gdnsd.org/). \ No newline at end of file +For GeoDNS zones we use [gdnsd](https://gdnsd.org/) with gdnsd config files generated by scripts called from the [Makefile](Makefile) file. -- 2.45.1