Commit 2155cbd1 authored by Leigh Stoller's avatar Leigh Stoller

Another nameserver whack for 6.X; use the proper version of rndc-confgen ...

parent 506e6dce
......@@ -70,7 +70,6 @@ my $MYSQLINSTALL = "/usr/local/bin/mysql_install_db";
my $MYSQLDBDIR = "/var/db/mysql";
my $GMAKE = "/usr/local/bin/gmake";
my $RNDC_CONFGEN = "/usr/local/sbin/rndc-confgen";
#
# Some files we edit/create
......@@ -108,8 +107,6 @@ my $INIT_PRIVKEY = "$TOP_SRCDIR/install/identity";
my $SSH_CONFIG = "/etc/ssh/ssh_config";
my $RNDC_KEY = "/usr/local/etc/rndc.key";
my $LOADER_CONF = "/boot/loader.conf";
my $SYSCTL_CONF = "/etc/sysctl.conf";
......@@ -922,6 +919,14 @@ Phase "ssh", "Setting up root ssh from boss to ops", sub {
};
Phase "rndc", "Setting up rndc for control of nameserver", sub {
my $RNDC_KEY = "/etc/namedb/rndc.key";
my $RNDC_CONFGEN = "/usr/sbin/rndc-confgen";
# Bind9 port prior to FreeBSD6
if ($FBSD_VERSION < 6) {
$RNDC_KEY = "/usr/local/etc/rndc.key";
$RNDC_CONFGEN = "/usr/local/sbin/rndc-confgen";
}
DoneIfExists($RNDC_KEY);
ExecQuietFatal("$RNDC_CONFGEN -a -r /dev/urandom");
};
......
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