summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Auhagen <sven.auhagen@voleatech.der>2016-09-18 10:36:24 +0200
committerRenato Botelho <garga@FreeBSD.org>2016-09-19 16:28:40 -0300
commitfe70ee324f0d6c6c4a7801f885341da43ecd2bd4 (patch)
tree6e1c53e686e1f6213a0558069efd99861e722480
parent4d45625a140b0079e2438d151d797ce96dd89cbf (diff)
downloadFreeBSD-ports-fe70ee324f0d6c6c4a7801f885341da43ecd2bd4.zip
FreeBSD-ports-fe70ee324f0d6c6c4a7801f885341da43ecd2bd4.tar.gz
Bind9 Error on ipv4 and ipv6 restart
(cherry picked from commit a31a689d0728a26a5c0da242c99ca62be3e0410f)
-rw-r--r--dns/pfSense-pkg-bind9/files/usr/local/pkg/bind.inc4
-rw-r--r--dns/pfSense-pkg-bind9/files/usr/local/pkg/bind.xml1
2 files changed, 3 insertions, 2 deletions
diff --git a/dns/pfSense-pkg-bind9/files/usr/local/pkg/bind.inc b/dns/pfSense-pkg-bind9/files/usr/local/pkg/bind.inc
index d198aea..cedeb06 100644
--- a/dns/pfSense-pkg-bind9/files/usr/local/pkg/bind.inc
+++ b/dns/pfSense-pkg-bind9/files/usr/local/pkg/bind.inc
@@ -855,7 +855,7 @@ function bind_write_rcfile() {
$rc['file'] = 'named.sh';
// Curly braces in the following <<<EOD are PHP {$variable}, not named.conf text { value; }
$rc['start'] = <<<EOD
- if [ -z "`/bin/ps auxw | /usr/bin/grep "[n]amed {$ip_version} -c /etc/namedb/named.conf" | /usr/bin/awk '{print $2}'`" ]; then
+ if [ -z "`/bin/ps auxw | /usr/bin/grep "[n]amed" | /usr/bin/awk '{print $2}'`" ]; then
{$BIND_LOCALBASE}/sbin/named {$ip_version} -c /etc/namedb/named.conf -u bind -t /cf/named/
fi
EOD;
@@ -865,7 +865,7 @@ EOD;
EOD;
// curly braces in the following <<<EOD are PHP {$variable}, not named.conf text { value; }
$rc['restart'] = <<<EOD
- if [ -z "`/bin/ps auxw | /usr/bin/grep "[n]amed {$ip_version} -c /etc/namedb/named.conf" | /usr/bin/awk '{print $2}'`" ]; then
+ if [ -z "`/bin/ps auxw | /usr/bin/grep "[n]amed" | /usr/bin/awk '{print $2}'`" ]; then
{$BIND_LOCALBASE}/sbin/named {$ip_version} -c /etc/namedb/named.conf -u bind -t /cf/named/
else
/usr/bin/killall -9 named 2>/dev/null
diff --git a/dns/pfSense-pkg-bind9/files/usr/local/pkg/bind.xml b/dns/pfSense-pkg-bind9/files/usr/local/pkg/bind.xml
index ca797eb..d0a2658 100644
--- a/dns/pfSense-pkg-bind9/files/usr/local/pkg/bind.xml
+++ b/dns/pfSense-pkg-bind9/files/usr/local/pkg/bind.xml
@@ -350,6 +350,7 @@
<description>
<![CDATA[
Enter IPs of DNS servers to use for recursion. Separate by semi-colons (;).<br />
+ Please also add a semi-colon (;) behind the last entry<br />
Applies only if Enable Forwarding is chosen.
]]>
</description>
OpenPOWER on IntegriCloud