maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

use namserver IP's for axfr/pdns-config, also add placeholder AXFRSERVERS for axfr-servers setting; fixes #1691

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-12-14 09:54:49 +01:00
parent 5ed0c3f2f3
commit f9101f880b
6 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
admin_configfiles.php
View File

@@ -30,6 +30,19 @@ if ($userinfo['change_serversettings'] == '1') {
$customer_tmpdir = Settings::Get('phpfpm.tmpdir'); $customer_tmpdir = Settings::Get('phpfpm.tmpdir');
} }
// try to convert namserver hosts to ip's
$ns_ips = "";
if (Settings::Get('system.nameservers') != '') {
$nameservers = explode(',', Settings::Get('system.nameservers'));
foreach ($nameservers as $nameserver) {
$nameserver = trim($nameserver);
$nameserver_ips = gethostbynamel($nameserver);
if (is_array($nameserver_ips) && count($nameserver_ips) > 0) {
$ns_ips .= implode(",", $nameserver_ips);
}
}
}
$replace_arr = Array( $replace_arr = Array(
'<SQL_UNPRIVILEGED_USER>' => $sql['user'], '<SQL_UNPRIVILEGED_USER>' => $sql['user'],
'<SQL_UNPRIVILEGED_PASSWORD>' => 'MYSQL_PASSWORD', '<SQL_UNPRIVILEGED_PASSWORD>' => 'MYSQL_PASSWORD',
@@ -39,6 +52,8 @@ if ($userinfo['change_serversettings'] == '1') {
'<SERVERNAME>' => Settings::Get('system.hostname'), '<SERVERNAME>' => Settings::Get('system.hostname'),
'<SERVERIP>' => Settings::Get('system.ipaddress'), '<SERVERIP>' => Settings::Get('system.ipaddress'),
'<NAMESERVERS>' => Settings::Get('system.nameservers'), '<NAMESERVERS>' => Settings::Get('system.nameservers'),
'<NAMESERVERS_IP>' => $ns_ips,
'<AXFRSERVERS>' => Settings::Get('system.axfrservers'),
'<VIRTUAL_MAILBOX_BASE>' => Settings::Get('system.vmail_homedir'), '<VIRTUAL_MAILBOX_BASE>' => Settings::Get('system.vmail_homedir'),
'<VIRTUAL_UID_MAPS>' => Settings::Get('system.vmail_uid'), '<VIRTUAL_UID_MAPS>' => Settings::Get('system.vmail_uid'),
'<VIRTUAL_GID_MAPS>' => Settings::Get('system.vmail_gid'), '<VIRTUAL_GID_MAPS>' => Settings::Get('system.vmail_gid'),

6
lib/configfiles/gentoo.xml
View File

@@ -396,7 +396,8 @@ mail IN A <SERVERIP>
################################# #################################
# allow-axfr-ips Allow zonetransfers only to these subnets # allow-axfr-ips Allow zonetransfers only to these subnets
# #
allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS> allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS_IP>
# add these entries to the list if any speficied: <AXFRSERVERS>
################################# #################################
# allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges.
@@ -938,7 +939,8 @@ gmysql-password=
################################# #################################
# allow-axfr-ips Allow zonetransfers only to these subnets # allow-axfr-ips Allow zonetransfers only to these subnets
# #
allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS> allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS_IP>
# add these entries to the list if any speficied: <AXFRSERVERS>
################################# #################################
# allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges.

6
lib/configfiles/jessie.xml
View File

@@ -380,7 +380,8 @@ exit "$RETVAL"
################################# #################################
# allow-axfr-ips Allow zonetransfers only to these subnets # allow-axfr-ips Allow zonetransfers only to these subnets
# #
allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS> allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS_IP>
# add these entries to the list if any speficied: <AXFRSERVERS>
################################# #################################
# allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges.
@@ -921,7 +922,8 @@ gmysql-password=
################################# #################################
# allow-axfr-ips Allow zonetransfers only to these subnets # allow-axfr-ips Allow zonetransfers only to these subnets
# #
# allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS> # allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS_IP>
# add these entries to the list if any speficied: <AXFRSERVERS>
################################# #################################
# allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges.

6
lib/configfiles/precise.xml
View File

@@ -346,7 +346,8 @@ exit "$RETVAL"
<install><![CDATA[apt-get install pdns-server pdns-backend-mysql]]></install> <install><![CDATA[apt-get install pdns-server pdns-backend-mysql]]></install>
<file name="/etc/powerdns/pdns.conf" backup="true" chmod="600"> <file name="/etc/powerdns/pdns.conf" backup="true" chmod="600">
<content><![CDATA[ <content><![CDATA[
allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS> allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS_IP>
# add these entries to the list if any speficied: <AXFRSERVERS>
allow-recursion=127.0.0.1 allow-recursion=127.0.0.1
config-dir=/etc/powerdns config-dir=/etc/powerdns
daemon=yes daemon=yes
@@ -407,7 +408,8 @@ include-dir=/etc/powerdns/froxlor/
<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root" <file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
chmod="600"> chmod="600">
<content><![CDATA[ <content><![CDATA[
allow-axfr-ips=<NAMESERVERS> allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS_IP>
# add these entries to the list if any speficied: <AXFRSERVERS>
#local-ipv6=YOUR_IPv6_(if_any) #local-ipv6=YOUR_IPv6_(if_any)
bind-config=<BIND_CONFIG_PATH>named.conf bind-config=<BIND_CONFIG_PATH>named.conf
bind-check-interval=180 bind-check-interval=180

9
lib/configfiles/trusty.xml
View File

@@ -379,7 +379,8 @@ exit "$RETVAL"
<install><![CDATA[apt-get install pdns-server pdns-backend-mysql]]></install> <install><![CDATA[apt-get install pdns-server pdns-backend-mysql]]></install>
<file name="/etc/powerdns/pdns.conf" backup="true" chmod="600"> <file name="/etc/powerdns/pdns.conf" backup="true" chmod="600">
<content><![CDATA[ <content><![CDATA[
allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS> allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS_IP>
# add these entries to the list if any speficied: <AXFRSERVERS>
allow-recursion=127.0.0.1 allow-recursion=127.0.0.1
config-dir=/etc/powerdns config-dir=/etc/powerdns
daemon=yes daemon=yes
@@ -417,7 +418,8 @@ gmysql-password=
<install><![CDATA[apt-get install pdns-server]]></install> <install><![CDATA[apt-get install pdns-server]]></install>
<file name="/etc/powerdns/pdns.conf" backup="true"> <file name="/etc/powerdns/pdns.conf" backup="true">
<content><![CDATA[ <content><![CDATA[
allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS> allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS_IP>
# add these entries to the list if any speficied: <AXFRSERVERS>
allow-recursion=127.0.0.1 allow-recursion=127.0.0.1
config-dir=/etc/powerdns config-dir=/etc/powerdns
daemon=yes daemon=yes
@@ -441,7 +443,8 @@ include-dir=/etc/powerdns/froxlor/
<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root" <file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
chmod="600"> chmod="600">
<content><![CDATA[ <content><![CDATA[
allow-axfr-ips=<NAMESERVERS> allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS_IP>
# add these entries to the list if any speficied: <AXFRSERVERS>
#local-ipv6=YOUR_IPv6_(if_any) #local-ipv6=YOUR_IPv6_(if_any)
bind-config=<BIND_CONFIG_PATH>named.conf bind-config=<BIND_CONFIG_PATH>named.conf
bind-check-interval=180 bind-check-interval=180

6
lib/configfiles/wheezy.xml
View File

@@ -424,7 +424,8 @@ exit "$RETVAL"
# allow-axfr-ips If enabled, restrict zonetransfers to originate from these # allow-axfr-ips If enabled, restrict zonetransfers to originate from these
# IP addresses # IP addresses
# #
allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS> allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS_IP>
# add these entries to the list if any speficied: <AXFRSERVERS>
################################# #################################
# allow-recursion List of netmasks that are allowed to recurse # allow-recursion List of netmasks that are allowed to recurse
@@ -763,7 +764,8 @@ gmysql-password=
# allow-axfr-ips If enabled, restrict zonetransfers to originate from these # allow-axfr-ips If enabled, restrict zonetransfers to originate from these
# IP addresses # IP addresses
# #
allow-axfr-ips=<NAMESERVERS> allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS_IP>
# add these entries to the list if any speficied: <AXFRSERVERS>
################################# #################################
# allow-recursion List of netmasks that are allowed to recurse # allow-recursion List of netmasks that are allowed to recurse