Commit 97169ec4 authored by Leigh Stoller's avatar Leigh Stoller

Configure/paramterize the ntpserver cname.

parent 5164a406
......@@ -768,6 +768,7 @@ MAILMANSUPPORT
BUGDBSUPPORT
OPSDBSUPPORT
NFSTRACESUPPORT
NTPSERVER
TBLOGFACIL
TESTBED_NETWORK
EXTERNAL_TESTBED_NETWORK
......@@ -4970,6 +4971,7 @@ done
#
......@@ -5041,6 +5043,7 @@ ARCHIVESUPPORT=0
NFSTRACESUPPORT=0
TBLOGFACIL="local5"
BOSSEVENTPORT=16505
NTPSERVER="ops"
UNIFIED_BOSS_AND_OPS=0
DISABLE_NAMED_SETUP=0
FRISEBEEMCASTADDR="234.5.6"
......@@ -5298,6 +5301,10 @@ cat >>confdefs.h <<_ACEOF
#define FRISEBEENUMPORTS "$FRISEBEENUMPORTS"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define NTPSERVER "$NTPSERVER"
_ACEOF
if test $OPSDBSUPPORT -eq 1; then
cat >>confdefs.h <<_ACEOF
......
......@@ -166,6 +166,7 @@ AC_SUBST(MAILMANSUPPORT)
AC_SUBST(BUGDBSUPPORT)
AC_SUBST(OPSDBSUPPORT)
AC_SUBST(NFSTRACESUPPORT)
AC_SUBST(NTPSERVER)
AC_SUBST(TBLOGFACIL)
AC_SUBST(TESTBED_NETWORK)
AC_SUBST(EXTERNAL_TESTBED_NETWORK)
......@@ -305,6 +306,7 @@ ARCHIVESUPPORT=0
NFSTRACESUPPORT=0
TBLOGFACIL="local5"
BOSSEVENTPORT=16505
NTPSERVER="ops"
UNIFIED_BOSS_AND_OPS=0
DISABLE_NAMED_SETUP=0
FRISEBEEMCASTADDR="234.5.6"
......@@ -444,6 +446,7 @@ AC_DEFINE_UNQUOTED(BOSSEVENTPORT, "$BOSSEVENTPORT")
AC_DEFINE_UNQUOTED(FRISEBEEMCASTADDR, "$FRISEBEEMCASTADDR")
AC_DEFINE_UNQUOTED(FRISEBEEMCASTPORT, "$FRISEBEEMCASTPORT")
AC_DEFINE_UNQUOTED(FRISEBEENUMPORTS, "$FRISEBEENUMPORTS")
AC_DEFINE_UNQUOTED(NTPSERVER, "$NTPSERVER")
if test $OPSDBSUPPORT -eq 1; then
AC_DEFINE_UNQUOTED(OPSDBSUPPORT, 1)
......
......@@ -45,6 +45,7 @@ SFSSUPPORT=0
CVSSUPPORT=changeme
NFSTRACESUPPORT=0
ARCHIVESUPPORT=changeme
NTPSERVER=changeme
DISABLE_NSE=1
# This means it is an inner elab!
ELABINELAB=1
......
......@@ -31,8 +31,6 @@ cvsup IN CNAME boss
; Ops and names it is otherwise known as...
%usernode_ina%
ntp1 IN CNAME ops
ntp2 IN CNAME ops
event-server IN CNAME ops
wiki IN CNAME ops
......@@ -40,6 +38,9 @@ wiki IN CNAME ops
%fsnode_ina%
%fsnode_mx%
; NTP is a CNAME to something
%ntp_cname%
; Routers interfaces in the various subnets
%private-router%
%public-router%
......
......@@ -2,7 +2,7 @@
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# All rights reserved.
#
use Getopt::Std;
......@@ -31,6 +31,7 @@ my $EXTERNAL_TESTBED_NETMASK = "@EXTERNAL_TESTBED_NETMASK@";
my $BOSSNODE_IP = "@BOSSNODE_IP@";
my $USERNODE_IP = "@USERNODE_IP@";
my $FSNODE_IP = "@FSNODE_IP@";
my $NTPSERVER = "@NTPSERVER@";
my $EXTERNAL_BOSSNODE_IP = "@EXTERNAL_BOSSNODE_IP@";
my $EXTERNAL_USERNODE_IP = "@EXTERNAL_USERNODE_IP@";
my $EXTERNAL_FSNODE_IP = "@EXTERNAL_FSNODE_IP@";
......@@ -162,7 +163,14 @@ while (<IF>) {
} else {
;
}
}
elsif ($2 eq "ntp_cname") {
$internal_strings .=
"ntp1\t\tIN\tCNAME\t${NTPSERVER}\n".
"ntp2\t\tIN\tCNAME\t${NTPSERVER}\n";
$external_strings .=
"ntp1\t\tIN\tCNAME\t${NTPSERVER}\n".
"ntp2\t\tIN\tCNAME\t${NTPSERVER}\n";
}
elsif ($2 eq "private-router") {
my $foo = "private-router\tIN\tA\t${PRIVATE_ROUTER}\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment