Line 35: |
Line 35: |
| | | |
| Note that ns2.auth.osuosl.org is not under our control and does not serve all our domains. | | Note that ns2.auth.osuosl.org is not under our control and does not serve all our domains. |
| + | |
| + | == Hostmasters == |
| + | |
| + | * Bernie Innocenti <bernie@codewiz.org> |
| + | * (others to be added when this documentation is finished) |
| + | |
| + | == Editing zone data == |
| + | |
| + | We use distributed version control and admin scripts to arbitrate edits to the zone files and nameserver configurations. |
| + | '''DO NOT EDIT THESE FILES LOCALLY''' without first confirming with all hostmasters. |
| + | |
| + | === Checkout nameserver config === |
| + | |
| + | To simplify merging, each hostmaster pushes to a separate branch: |
| + | |
| + | git clone root@lightwave.sugarlabs.org:/var/lib/bind/etc/bind ns |
| + | git config --add remote.origin.push '+refs/heads/*:refs/remotes/USERNAME/*' |
| + | |
| + | '''FIXME''': use an unprivileged group "hostmaster" rather than root. |
| + | |
| + | == Edit zone data == |
| + | |
| + | TODO |
| + | |
| + | * Please keep the zone files tidy, by following indentation style |
| + | |
| + | * Add comments as needed to describe obscure records in the zone files |
| + | |
| + | * Remember to keep reverse zones always up to date |
| + | |
| + | == Push changes back to master nameserver == |
| + | |
| + | * First, update and resolve conflicts, if any: |
| + | |
| + | git pull |
| + | |
| + | * We push to our own branches and then merge into the sandbox: |
| + | |
| + | git push |
| + | ssh root@lightwave.sugarlabs.org "cd /var/lib/bind/etc/bind && git merge remotes/USERNAME" |