From 1454d0cea688a03899c92e68efd1cc48a7706b1a Mon Sep 17 00:00:00 2001
From: Matt Rude <matt@mattrude.com>
Date: Wed, 18 May 2011 11:21:02 -0500
Subject: updates for Linux vs FreeBSD

---
 scripts/do-build-index  | 10 +++++-----
 scripts/do-newntpstat   |  4 ++--
 scripts/do-ntp-rrdstats |  4 ++--
 scripts/do-xntp         | 11 +++++------
 4 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'scripts')

diff --git a/scripts/do-build-index b/scripts/do-build-index
index 3855b33..8312f4e 100755
--- a/scripts/do-build-index
+++ b/scripts/do-build-index
@@ -1,20 +1,20 @@
 #!/bin/sh
 
-POOLPAGE=/usr/local/www/data/status
-TEMPLATESDIR=/usr/local/www/data/scripts/templates
+POOLPAGE=/var/www/time.mattrude.com/status
+TEMPLATESDIR=/var/www/time.mattrude.com/scripts/templates
 
 cd $POOLPAGE
 cat /dev/null > out.template
 
 echo "<h2>NTP Hosts</h2>
 <ul>" >> out.template
-for X in `cat /usr/local/www/data/rrd/list-of-systems`
+for X in `cat /var/www/time.mattrude.com/rrd/list-of-systems`
 do
 	echo "<li><a href=$X>$X</a>" >> out.template
 done
 echo "</ul>" >> out.template
 
-for X in `cat /usr/local/www/data/rrd/list-of-systems`
+for X in `cat /var/www/time.mattrude.com/rrd/list-of-systems`
 do
 	sed -e s/POOL/$X/g $TEMPLATESDIR/template >> out.template
 done
@@ -23,7 +23,7 @@ sync
 cat $TEMPLATESDIR/index-head out.template $TEMPLATESDIR/index-tail > index.html
 
 # Build the indexs for the hosts.
-for X in `cat /usr/local/www/data/rrd/list-of-systems`
+for X in `cat /var/www/time.mattrude.com/rrd/list-of-systems`
 do
 	cat /dev/null > out.template
         sed -e s/POOL/$X/g $TEMPLATESDIR/template3 >> out.template
diff --git a/scripts/do-newntpstat b/scripts/do-newntpstat
index b45da14..1d074b8 100755
--- a/scripts/do-newntpstat
+++ b/scripts/do-newntpstat
@@ -5,7 +5,7 @@ case "$1" in
 	"")	echo "Missing system name."; exit 1
 esac
 
-RRD_BIN=/usr/local/bin
+RRD_BIN=/usr/bin
 
 # 26 hours and 8 days data bins
 
@@ -23,5 +23,5 @@ ${RRD_BIN}/rrdtool create $1.rrd   \
 #end
 
 mv $1.rrd ../rrd/
-#echo $1 >> ../rrd/list-of-systems
+echo $1 >> ../rrd/list-of-systems
 ./do-build-index
diff --git a/scripts/do-ntp-rrdstats b/scripts/do-ntp-rrdstats
index 2c8e97b..0c2b90d 100755
--- a/scripts/do-ntp-rrdstats
+++ b/scripts/do-ntp-rrdstats
@@ -4,7 +4,7 @@ case "$1" in
 	"")     echo "Missing system name."; exit 1
 esac
 
-/usr/local/bin/ntpq -4 -c rv $1 | awk 'BEGIN{ RS=","}{ print }' >> /tmp/ntp-rrdstats.$$
+/usr/sbin/ntpq -4 -c rv $1 | awk 'BEGIN{ RS=","}{ print }' >> /tmp/ntp-rrdstats.$$
 
 NOFFSET=`grep offset /tmp/ntp-rrdstats.$$ | awk 'BEGIN{FS="="}{print $2}'`
 NFREQ=`grep frequency /tmp/ntp-rrdstats.$$ | awk 'BEGIN{FS="="}{print $2}'`
@@ -17,7 +17,7 @@ JITTER=`grep jitter /tmp/ntp-rrdstats.$$ | awk 'BEGIN{FS="="}{print $2}'`
 
 # keep this in the same order as do-newntpstat creates them, please.
 
-/usr/local/bin/rrdtool update \
+/usr/bin/rrdtool update \
     $1.rrd \
     N:${NOFFSET}:${NSJIT}:${NCJIT}:${NWANDER}:${NFREQ}:${NDISPER}:${JITTER}
 
diff --git a/scripts/do-xntp b/scripts/do-xntp
index 4ebdc1b..2d09a3c 100755
--- a/scripts/do-xntp
+++ b/scripts/do-xntp
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-RRD_BIN=/usr/local/bin
-RRDPAGE=/usr/local/www/data/rrd
-SCRIPTS=/usr/local/www/data/scripts
+RRD_BIN=/usr/bin
+RRDPAGE=/var/www/time.mattrude.com/rrd
+SCRIPTS=/var/www/time.mattrude.com/scripts
 
 cd ${RRDPAGE}
 
@@ -90,9 +90,8 @@ ${RRD_BIN}/rrdtool graph \
         --title "`TZ=UTC date`" \
         --start -93600 \
         DEF:disp=${RRDPAGE}/${X}.rrd:jitter:LAST \
-        CDEF:ndisp=disp,1000,/ \
-        LINE1:ndisp#0000FF:"Jitter" \
-        GPRINT:ndisp:LAST:%lf
+        LINE1:disp#0000FF:"Jitter" \
+        GPRINT:disp:LAST:%lf
 
 # fat (weekly) graphs
 
-- 
cgit v1.2.3-59-ga6da