diff --git a/admin_configfiles.php b/admin_configfiles.php index edcbab6f..b3441881 100644 --- a/admin_configfiles.php +++ b/admin_configfiles.php @@ -97,7 +97,8 @@ if($userinfo['change_serversettings'] == '1') '' => $settings['system']['vmail_gid'], '' => ($settings['system']['use_ssl'] == '1') ? 'imaps pop3s' : '', '' => ($settings['system']['mod_fcgid_tmpdir'] != '') ? makeCorrectDir($settings['system']['mod_fcgid_tmpdir']) : '/tmp/', - '' => makeCorrectDir(dirname(__FILE__)) + '' => makeCorrectDir(dirname(__FILE__)), + '' => makeCorrectDir($settings['system']['bindconf_directory']) ); $files = ''; $configpage = ''; diff --git a/templates/misc/configfiles/debian_lenny/powerdns/etc_powerdns_pdns-froxlor.conf b/templates/misc/configfiles/debian_lenny/powerdns/etc_powerdns_pdns-froxlor.conf index ca2d0228..5e12377d 100644 --- a/templates/misc/configfiles/debian_lenny/powerdns/etc_powerdns_pdns-froxlor.conf +++ b/templates/misc/configfiles/debian_lenny/powerdns/etc_powerdns_pdns-froxlor.conf @@ -1,6 +1,6 @@ allow-axfr-ips= #local-ipv6=YOUR_IPv6_(if_any) -bind-config=/etc/bind/named.conf +bind-config=named.conf bind-check-interval=180 log-dns-details=yes local-address=,127.0.0.1 diff --git a/templates/misc/configfiles/debian_lenny/powerdns/etc_powerdns_pdns.conf b/templates/misc/configfiles/debian_lenny/powerdns/etc_powerdns_pdns.conf index 3c38d97a..56d4b2a0 100644 --- a/templates/misc/configfiles/debian_lenny/powerdns/etc_powerdns_pdns.conf +++ b/templates/misc/configfiles/debian_lenny/powerdns/etc_powerdns_pdns.conf @@ -11,7 +11,7 @@ setgid=pdns setuid=pdns socket-dir=/var/run version-string=powerdns -bind-config=/etc/bind/named.conf +bind-config=named.conf bind-check-interval=300 include=/etc/powerdns/pdns_froxlor.conf diff --git a/templates/misc/configfiles/freebsd/powerdns/usr_local_etc_pdns_pdns.conf b/templates/misc/configfiles/freebsd/powerdns/usr_local_etc_pdns_pdns.conf index 7cfd0308..da05e560 100644 --- a/templates/misc/configfiles/freebsd/powerdns/usr_local_etc_pdns_pdns.conf +++ b/templates/misc/configfiles/freebsd/powerdns/usr_local_etc_pdns_pdns.conf @@ -6,5 +6,5 @@ launch=bind lazy-recursion=yes recursor= master=yes -bind-config=/etc/namedb/froxlor_bind.conf +bind-config=froxlor_bind.conf bind-check-interval=180 diff --git a/templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns-froxlor.conf b/templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns-froxlor.conf index ca2d0228..5e12377d 100644 --- a/templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns-froxlor.conf +++ b/templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns-froxlor.conf @@ -1,6 +1,6 @@ allow-axfr-ips= #local-ipv6=YOUR_IPv6_(if_any) -bind-config=/etc/bind/named.conf +bind-config=named.conf bind-check-interval=180 log-dns-details=yes local-address=,127.0.0.1 diff --git a/templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns.conf b/templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns.conf index 3c38d97a..56d4b2a0 100644 --- a/templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns.conf +++ b/templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns.conf @@ -11,7 +11,7 @@ setgid=pdns setuid=pdns socket-dir=/var/run version-string=powerdns -bind-config=/etc/bind/named.conf +bind-config=named.conf bind-check-interval=300 include=/etc/powerdns/pdns_froxlor.conf diff --git a/templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns-froxlor.conf b/templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns-froxlor.conf index ca2d0228..5e12377d 100644 --- a/templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns-froxlor.conf +++ b/templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns-froxlor.conf @@ -1,6 +1,6 @@ allow-axfr-ips= #local-ipv6=YOUR_IPv6_(if_any) -bind-config=/etc/bind/named.conf +bind-config=named.conf bind-check-interval=180 log-dns-details=yes local-address=,127.0.0.1 diff --git a/templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns.conf b/templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns.conf index 3c38d97a..56d4b2a0 100644 --- a/templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns.conf +++ b/templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns.conf @@ -11,7 +11,7 @@ setgid=pdns setuid=pdns socket-dir=/var/run version-string=powerdns -bind-config=/etc/bind/named.conf +bind-config=named.conf bind-check-interval=300 include=/etc/powerdns/pdns_froxlor.conf