From 3886210b359b32fed032dfe501b688d280d0c487 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 16 Dec 2014 21:08:26 +0000 Subject: [PATCH] Make update-dns only reload named if something actually changed --- roles/dns/files/update-dns | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/roles/dns/files/update-dns b/roles/dns/files/update-dns index b166a12e1f..7f617c137f 100755 --- a/roles/dns/files/update-dns +++ b/roles/dns/files/update-dns @@ -2,18 +2,21 @@ dnsgit='https://infrastructure.fedoraproject.org/infra/dns.git' destdir='/var/named/master/' -if [ -d $destdir ]; +if [ ! -d $destdir ]; then - cd $destdir - git pull -X theirs -else git clone $dnsgit $destdir fi -cd $tmpdir -# change context so the chroot can cope -chown -R named.named $destdir -chcon -u system_u $destdir/* $destdir/*/* -# reload named -/sbin/service named start >>/dev/null 2>&1 -/sbin/service named reload >>/dev/null 2>&1 +cd $destdir +git fetch origin + +if [ "`git diff origin/master master`" != "" ]; +then + git pull -X theirs + # change context so the chroot can cope + chown -R named.named $destdir + chcon -u system_u $destdir/* $destdir/*/* + # reload named + /sbin/service named start >>/dev/null 2>&1 + /sbin/service named reload >>/dev/null 2>&1 +fi