Service/Nameservers: Difference between revisions

No edit summary
No edit summary
Line 69: Line 69:
== Push changes back to master nameserver ==
== Push changes back to master nameserver ==


* First, update and resolve conflicts, if any:
* First, commit your changes:
 
git commit -a
 
* Update from remote to resolve conflicts, if any:


  git pull
  git pull
Line 76: Line 80:


  git push
  git push
  ssh root@lightwave.sugarlabs.org "cd /var/lib/bind/etc/bind && git merge remotes/USERNAME/master"
  ssh root@lightwave.sugarlabs.org 'cd /var/lib/bind/etc/bind && git merge remotes/USERNAME/master'


* Now reload the nameserver configuration, checking for errors:
* Now reload the nameserver configuration, checking for errors:


  ssh root@lightwave.sugarlabs.org tail -f /var/log/daemon.log &
  ssh root@lightwave.sugarlabs.org 'tail -f /var/log/daemon.log & /etc/init.d/bind9 reload'
ssh root@lightwave.sugarlabs.org /etc/init.d/bind9 reload