diff --git a/actions/admin/settings/160.nameserver.php b/actions/admin/settings/160.nameserver.php
index 030ceaeb..11d2b6d3 100644
--- a/actions/admin/settings/160.nameserver.php
+++ b/actions/admin/settings/160.nameserver.php
@@ -39,6 +39,16 @@ return array(
'default' => false,
'save_method' => 'storeSettingField'
),
+ 'system_dns_server' => array(
+ 'label' => $lng['serversettings']['dns_server'],
+ 'settinggroup' => 'system',
+ 'varname' => 'dns_server',
+ 'type' => 'option',
+ 'default' => 'bind',
+ 'option_mode' => 'one',
+ 'option_options' => array('bind' => 'Bind9', 'pdns' => 'PowerDNS'),
+ 'save_method' => 'storeSettingField'
+ ),
'system_bindconf_directory' => array(
'label' => $lng['serversettings']['bindconf_directory'],
'settinggroup' => 'system',
diff --git a/install/froxlor.sql b/install/froxlor.sql
index b6462902..dc692f2f 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -527,6 +527,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('system', 'leenabled', '0'),
('system', 'backupenabled', '0'),
('system', 'dnsenabled', '0'),
+ ('system', 'dns_server', 'bind'),
('panel', 'decimal_places', '4'),
('panel', 'adminmail', 'admin@SERVERNAME'),
('panel', 'phpmyadmin_url', ''),
@@ -558,7 +559,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('panel', 'password_special_char_required', '0'),
('panel', 'password_special_char', '!?<>§$%+#=@'),
('panel', 'version', '0.9.35.1'),
- ('panel', 'db_version', '201605120');
+ ('panel', 'db_version', '201605170');
DROP TABLE IF EXISTS `panel_tasks`;
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
index ef9dbe27..d0e7b94c 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -3313,7 +3313,7 @@ if (isFroxlorVersion('0.9.35.1') && isDatabaseVersion('201603150')) {
updateToDbVersion('201604270');
}
-if (isFroxlorVersion('0.9.35.1') && isDatabaseVersion('201604270')) {
+if (isDatabaseVersion('201604270')) {
showUpdateStep("Adding new dns related tables and settings");
$enable_dns = isset($_POST['enable_dns']) ? (int) $_POST['enable_dns'] : "0";
@@ -3336,7 +3336,7 @@ if (isFroxlorVersion('0.9.35.1') && isDatabaseVersion('201604270')) {
updateToDbVersion('201605090');
}
-if (isFroxlorVersion('0.9.35.1') && isDatabaseVersion('201605090')) {
+if (isDatabaseVersion('201605090')) {
showUpdateStep("Adjusting SPF record setting");
$current_spf = Settings::Get('spf.spf_entry');
@@ -3347,3 +3347,13 @@ if (isFroxlorVersion('0.9.35.1') && isDatabaseVersion('201605090')) {
updateToDbVersion('201605120');
}
+
+if (isDatabaseVersion('201605120')) {
+
+ showUpdateStep("Adding new dns-server setting");
+ $new_dns_daemon = isset($_POST['new_dns_daemon']) ? $_POST['new_dns_daemon'] : "bind";
+ Settings::AddNew("system.dns_server", $new_dns_daemon);
+ lastStepStatus(0);
+
+ updateToDbVersion('201605170');
+}
diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php
index 5ebd6bf5..403d55d3 100644
--- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php
+++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php
@@ -18,47 +18,45 @@
/**
* checks if the new-version has some updating to do
*
- * @param boolean $has_preconfig pointer to check if any preconfig has to be output
- * @param string $return pointer to output string
- * @param string $current_version current froxlor version
+ * @param boolean $has_preconfig
+ * pointer to check if any preconfig has to be output
+ * @param string $return
+ * pointer to output string
+ * @param string $current_version
+ * current froxlor version
*
* @return null
*/
-function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $current_db_version) {
-
+function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $current_db_version)
+{
global $lng;
- if(versionInUpdate($current_version, '0.9.4-svn2'))
- {
+ if (versionInUpdate($current_version, '0.9.4-svn2')) {
$has_preconfig = true;
$description = 'Froxlor now enables the usage of a domain-wildcard entry and subdomains for this domain at the same time (subdomains are parsed before the main-domain vhost container).';
- $description.= 'This makes it possible to catch all non-existing subdomains with the main vhost but also have the ability to use subdomains for that domain. ';
- $description.= 'If you would like Froxlor to do so with your domains, the update script can set the correct values for existing domains for you. Note: future domains will have wildcard-entries enabled by default no matter how you decide here.';
+ $description .= 'This makes it possible to catch all non-existing subdomains with the main vhost but also have the ability to use subdomains for that domain. ';
+ $description .= 'If you would like Froxlor to do so with your domains, the update script can set the correct values for existing domains for you. Note: future domains will have wildcard-entries enabled by default no matter how you decide here.';
$question = 'Do you want to use wildcard-entries for existing domains?: ';
- $question.= makeyesno('update_domainwildcardentry', '1', '0', '1');
+ $question .= makeyesno('update_domainwildcardentry', '1', '0', '1');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
- if(versionInUpdate($current_version, '0.9.6-svn2'))
- {
- if(!PHPMailer::ValidateAddress(Settings::Get('panel.adminmail')))
- {
+ if (versionInUpdate($current_version, '0.9.6-svn2')) {
+ if (! PHPMailer::ValidateAddress(Settings::Get('panel.adminmail'))) {
$has_preconfig = true;
$description = 'Froxlor uses a newer version of the phpMailerClass and determined that your current admin-mail address is invalid.';
- $question = 'Please specify a new admin-email address: ';
+ $question = 'Please specify a new admin-email address: ';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}
- if(versionInUpdate($current_version, '0.9.6-svn3'))
- {
+ if (versionInUpdate($current_version, '0.9.6-svn3')) {
$has_preconfig = true;
$description = 'You now have the possibility to define default error-documents for your webserver which replace the default webserver error-messages.';
$question = 'Do you want to enable default error-documents?: ';
- $question .= makeyesno('update_deferr_enable', '1', '0', '0').'
';
+ if (Settings::Get('system.webserver') == 'apache2') {
$question .= 'Path/URL for error 500:
';
$question .= 'Path/URL for error 401:
';
$question .= 'Path/URL for error 403:
';
@@ -67,37 +65,33 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
- if(versionInUpdate($current_version, '0.9.6-svn4'))
- {
+ if (versionInUpdate($current_version, '0.9.6-svn4')) {
$has_preconfig = true;
$description = 'You can define a default support-ticket priority level which is pre-selected for new support-tickets.';
$question = 'Which should be the default ticket-priority?: ';
$question .= '';
+ $priorities .= makeoption($lng['ticket']['normal'], '2', '2');
+ $priorities .= makeoption($lng['ticket']['low'], '3', '2');
+ $question .= $priorities . '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
- if(versionInUpdate($current_version, '0.9.6-svn5'))
- {
+ if (versionInUpdate($current_version, '0.9.6-svn5')) {
$has_preconfig = true;
$description = 'If you have more than one PHP configurations defined in Froxlor you can now set a default one which will be used for every domain.';
$question = 'Select default PHP configuration: ';
$question .= '';
+ $question .= $configs . '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
- if(versionInUpdate($current_version, '0.9.6-svn6'))
- {
+ if (versionInUpdate($current_version, '0.9.6-svn6')) {
$has_preconfig = true;
$description = 'For the new FTP-quota feature, you can now chose the currently used ftpd-software.';
$question = 'Used FTPd-software: ';
@@ -108,72 +102,63 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
- if(versionInUpdate($current_version, '0.9.7-svn1'))
- {
+ if (versionInUpdate($current_version, '0.9.7-svn1')) {
$has_preconfig = true;
$description = 'You can now choose whether customers can select the http-redirect code and which of them acts as default.';
$question = 'Allow customer chosen redirects?: ';
- $question.= makeyesno('update_customredirect_enable', '1', '0', '1').'
';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}
- if(versionInUpdate($current_version, '0.9.9-svn1'))
- {
+ if (versionInUpdate($current_version, '0.9.9-svn1')) {
$has_preconfig = true;
$description = 'When entering MX servers to Froxlor there was no mail-, imap-, pop3- and smtp-"A record" created. You can now chose whether this should be done or not.';
$question = 'Do you want these A-records to be created even with MX servers given?: ';
- $question.= makeyesno('update_defdns_mailentry', '1', '0', '0');
+ $question .= makeyesno('update_defdns_mailentry', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
- if(versionInUpdate($current_version, '0.9.10-svn1'))
- {
+ if (versionInUpdate($current_version, '0.9.10-svn1')) {
$has_nouser = false;
$has_nogroup = false;
$result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'httpuser'");
$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
- if(!isset($result) || !isset($result['value']))
- {
+ if (! isset($result) || ! isset($result['value'])) {
$has_preconfig = true;
$has_nouser = true;
$guessed_user = 'www-data';
- if(function_exists('posix_getuid')
- && function_exists('posix_getpwuid')
- ) {
+ if (function_exists('posix_getuid') && function_exists('posix_getpwuid')) {
$_httpuser = posix_getpwuid(posix_getuid());
$guessed_user = $_httpuser['name'];
}
@@ -182,31 +167,24 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'httpgroup'");
$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
- if(!isset($result) || !isset($result['value']))
- {
+ if (! isset($result) || ! isset($result['value'])) {
$has_preconfig = true;
$has_nogroup = true;
$guessed_group = 'www-data';
- if(function_exists('posix_getgid')
- && function_exists('posix_getgrgid')
- ) {
+ if (function_exists('posix_getgid') && function_exists('posix_getgrgid')) {
$_httpgroup = posix_getgrgid(posix_getgid());
$guessed_group = $_httpgroup['name'];
}
}
- if($has_nouser || $has_nogroup)
- {
+ if ($has_nouser || $has_nogroup) {
$description = 'Please enter the correct username/groupname of the webserver on your system We\'re guessing the user but it might not be correct, so please check.';
- if($has_nouser)
- {
- $question = 'Please enter the webservers username: ';
- }
- elseif($has_nogroup)
- {
- $question2 = 'Please enter the webservers groupname: ';
- if($has_nouser) {
- $question .= '
'.$question2;
+ if ($has_nouser) {
+ $question = 'Please enter the webservers username: ';
+ } elseif ($has_nogroup) {
+ $question2 = 'Please enter the webservers groupname: ';
+ if ($has_nouser) {
+ $question .= '
' . $question2;
} else {
$question = $question2;
}
@@ -215,227 +193,202 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
}
}
- if(versionInUpdate($current_version, '0.9.10'))
- {
+ if (versionInUpdate($current_version, '0.9.10')) {
$has_preconfig = true;
$description = 'you can now decide whether Froxlor should be reached via hostname/froxlor or directly via the hostname.';
$question = 'Do you want Froxlor to be reached directly via the hostname?: ';
- $question.= makeyesno('update_directlyviahostname', '1', '0', '0');
+ $question .= makeyesno('update_directlyviahostname', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
- if(versionInUpdate($current_version, '0.9.11-svn1'))
- {
+ if (versionInUpdate($current_version, '0.9.11-svn1')) {
$has_preconfig = true;
$description = 'It is possible to enhance security with setting a regular expression to force your customers to enter more complex passwords.';
$question = 'Enter a regular expression to force a higher password complexity (leave empty for none): ';
- $question.= '';
+ $question .= '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
- if(versionInUpdate($current_version, '0.9.11-svn3'))
- {
+ if (versionInUpdate($current_version, '0.9.11-svn3')) {
$has_preconfig = true;
$description = 'As Froxlor can now handle perl, you have to specify where the perl executable is (only if you\'re running lighttpd, else just leave empty).';
$question = 'Path to perl (default \'/usr/bin/perl\'): ';
- $question.= '';
+ $question .= '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
- if(versionInUpdate($current_version, '0.9.12-svn1'))
- {
- if(Settings::Get('system.mod_fcgid') == 1)
- {
+ if (versionInUpdate($current_version, '0.9.12-svn1')) {
+ if (Settings::Get('system.mod_fcgid') == 1) {
$has_preconfig = true;
$description = 'You can chose whether you want Froxlor to use FCGID itself too now.';
$question = 'Use FCGID for the Froxlor Panel?: ';
- $question.= makeyesno('update_fcgid_ownvhost', '1', '0', '0').'
';
- $question.= 'If \'yes\', please specify local user/group (have to exist, Froxlor does not add them automatically):
';
+ $question .= 'Local group: ';
+ $question .= ' ';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}
- if(versionInUpdate($current_version, '0.9.12-svn2'))
- {
+ if (versionInUpdate($current_version, '0.9.12-svn2')) {
$has_preconfig = true;
$description = 'Many apache user will have problems using perl/CGI as the customer docroots are not within the suexec path. Froxlor provides a simple workaround for that.';
$question = 'Enable Apache/SuExec/Perl workaround?: ';
- $question.= makeyesno('update_perl_suexecworkaround', '1', '0', '0').'
';
- $question.= 'If \'yes\', please specify a path within the suexec path where Froxlor will create symlinks to customer perl-enabled paths:
';
- $question.= 'Path for symlinks (must be within suexec path): ';
- $question.= ' ';
+ $question .= makeyesno('update_perl_suexecworkaround', '1', '0', '0') . '
';
+ $question .= 'If \'yes\', please specify a path within the suexec path where Froxlor will create symlinks to customer perl-enabled paths:
';
+ $question .= 'Path for symlinks (must be within suexec path): ';
+ $question .= ' ';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
- if(versionInUpdate($current_version, '0.9.12-svn4'))
- {
- if((int)Settings::Get('system.awstats_enabled') == 1)
- {
+ if (versionInUpdate($current_version, '0.9.12-svn4')) {
+ if ((int) Settings::Get('system.awstats_enabled') == 1) {
$has_preconfig = true;
$description = 'Due to different paths of awstats_buildstaticpages.pl and awstats.pl you can set a different path for awstats.pl now.';
$question = 'Path to \'awstats.pl\'?: ';
- $question.= ' ';
+ $question .= ' ';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}
- if(versionInUpdate($current_version, '0.9.13-svn1'))
- {
- if((int)Settings::Get('autoresponder.autoresponder_active') == 1)
- {
+ if (versionInUpdate($current_version, '0.9.13-svn1')) {
+ if ((int) Settings::Get('autoresponder.autoresponder_active') == 1) {
$has_preconfig = true;
$description = 'Froxlor can now limit the number of autoresponder-entries for each user. Here you can set the value which will be available for each customer (Of course you can change the value for each customer separately after the update).';
$question = 'How many autoresponders should your customers be able to add?: ';
- $question.= ' '.makecheckbox('update_autoresponder_default', $lng['customer']['unlimited'], '-1', false, 0, true, true).' ';
+ $question .= ' ' . makecheckbox('update_autoresponder_default', $lng['customer']['unlimited'], '-1', false, 0, true, true) . ' ';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}
- if(versionInUpdate($current_version, '0.9.13.1'))
- {
- if((int)Settings::Get('system.mod_fcgid_ownvhost') == 1)
- {
+ if (versionInUpdate($current_version, '0.9.13.1')) {
+ if ((int) Settings::Get('system.mod_fcgid_ownvhost') == 1) {
$has_preconfig = true;
$description = 'You have FCGID for Froxlor itself activated. You can now specify a PHP-configuration for this.';
$question = 'Select Froxlor-vhost PHP configuration: ';
$question .= '';
+ $question .= $configs . '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}
- if(versionInUpdate($current_version, '0.9.14-svn3'))
- {
- if((int)Settings::Get('system.awstats_enabled') == 1)
- {
+ if (versionInUpdate($current_version, '0.9.14-svn3')) {
+ if ((int) Settings::Get('system.awstats_enabled') == 1) {
$has_preconfig = true;
$description = 'To have icons in AWStats statistic-pages please enter the path to AWStats icons folder.';
$question = 'Path to AWSTats icons folder: ';
- $question.= '';
+ $question .= '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}
- if(versionInUpdate($current_version, '0.9.14-svn4'))
- {
- if((int)Settings::Get('system.use_ssl') == 1)
- {
+ if (versionInUpdate($current_version, '0.9.14-svn4')) {
+ if ((int) Settings::Get('system.use_ssl') == 1) {
$has_preconfig = true;
$description = 'Froxlor now has the possibility to set \'SSLCertificateChainFile\' for the apache webserver.';
$question = 'Enter filename (leave empty for none): ';
- $question.= '';
+ $question .= '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}
- if(versionInUpdate($current_version, '0.9.14-svn6'))
- {
+ if (versionInUpdate($current_version, '0.9.14-svn6')) {
$has_preconfig = true;
$description = 'You can now allow customers to use any of their domains as username for the login.';
$question = 'Do you want to enable domain-login for all customers?: ';
- $question.= makeyesno('update_allow_domain_login', '1', '0', '0');
+ $question .= makeyesno('update_allow_domain_login', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
- if(versionInUpdate($current_version, '0.9.14-svn10'))
- {
+ if (versionInUpdate($current_version, '0.9.14-svn10')) {
$has_preconfig = true;
$description = 'This update removes the unsupported real-time option. Additionally the deprecated tables for navigation and cronscripts are removed, any modules using these tables need to be updated to the new structure!';
$question = '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
- if(versionInUpdate($current_version, '0.9.16-svn1'))
- {
+ if (versionInUpdate($current_version, '0.9.16-svn1')) {
$has_preconfig = true;
$description = 'Froxlor now features support for php-fpm.';
$question = 'Do you want to enable php-fpm?: ';
- $question.= makeyesno('update_phpfpm_enabled', '1', '0', '0').'
';
+ $question .= 'Traffic warning level: ';
+ $question .= ' ';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
- if(versionInUpdate($current_version, '0.9.18-svn2'))
- {
+ if (versionInUpdate($current_version, '0.9.18-svn2')) {
$has_preconfig = true;
$description = 'As you can (obviously) see, Froxlor now comes with a new theme. You also have the possibility to switch back to "Classic" if you want to.';
$question = 'Select default panel theme: ';
- $question.= '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
- if(versionInUpdate($current_version, '0.9.28-svn4'))
- {
+ if (versionInUpdate($current_version, '0.9.28-svn4')) {
$has_preconfig = true;
$description = 'This version introduces a lot of profound changes:';
$description .= '
Improving the whole template system
Full UTF-8 support
Removing support for the former default theme \'Classic\'
';
@@ -444,13 +397,12 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description .= 'test this update in a testing environment using your existing data.
';
$question = 'Select your preferred Classic Theme replacement: ';
- $question.= '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
@@ -460,16 +412,16 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
if (Settings::Get('system.webserver') == 'apache2') {
$has_preconfig = true;
$description = 'Froxlor now supports the new Apache 2.4. Please be aware that you need to load additional apache-modules in ordner to use it. ';
- $description.= '
';
$question = 'Do you want to enable the Apache-2.4 modification?: ';
- $question.= makeyesno('update_system_apache24', '1', '0', '0');
+ $question .= makeyesno('update_system_apache24', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
} elseif (Settings::Get('system.webserver') == 'nginx') {
$has_preconfig = true;
$description = 'The path to nginx\'s fastcgi_params file is now customizable.
';
$question = 'Please enter full path to you nginx/fastcgi_params file (including filename): ';
- $question.= '';
+ $question .= '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}
@@ -478,11 +430,11 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$has_preconfig = true;
- $description = 'This version adds an option to append the domain-name to the document-root for domains and subdomains. ';
+ $description = 'This version adds an option to append the domain-name to the document-root for domains and subdomains. ';
$description .= 'You can enable or disable this feature anytime from settings -> system settings. ';
$question = 'Do you want to automatically append the domain-name to the documentroot of newly created domains?: ';
- $question.= makeyesno('update_system_documentroot_use_default_value', '1', '0', '0');
+ $question .= makeyesno('update_system_documentroot_use_default_value', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
@@ -491,12 +443,10 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$has_preconfig = true;
// just an information about the new sendmail parameter (#1134)
- $description = 'Froxlor changed the default parameter-set of sendmail (php.ini) ';
+ $description = 'Froxlor changed the default parameter-set of sendmail (php.ini) ';
$description .= 'sendmail_path = "/usr/sbin/sendmail -t -i -f {CUSTOMER_EMAIL}"
';
$description .= 'If you don\'t have any problems with sending mails, you don\'t need to change this';
- if (Settings::Get('system.mod_fcgid') == '1'
- || Settings::Get('phpfpm.enabled') == '1'
- ) {
+ if (Settings::Get('system.mod_fcgid') == '1' || Settings::Get('phpfpm.enabled') == '1') {
// information about removal of php's safe_mode
$description .= '
The php safe_mode flag has been removed as current versions of PHP ';
$description .= 'do not support it anymore.
';
@@ -509,45 +459,43 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
if (versionInUpdate($current_version, '0.9.29-dev1')) {
// we only need to ask if fcgid|php-fpm is enabled
- if (Settings::Get('system.mod_fcgid') == '1'
- || Settings::Get('phpfpm.enabled') == '1'
- ) {
+ if (Settings::Get('system.mod_fcgid') == '1' || Settings::Get('phpfpm.enabled') == '1') {
$has_preconfig = true;
- $description = 'Standard-subdomains can now be hidden from the php-configuration overview. ';
+ $description = 'Standard-subdomains can now be hidden from the php-configuration overview. ';
$question = 'Do you want to hide the standard-subdomains (this can be changed in the settings any time)?: ';
- $question.= makeyesno('hide_stdsubdomains', '1', '0', '0');
+ $question .= makeyesno('hide_stdsubdomains', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}
if (versionInUpdate($current_version, '0.9.29-dev2')) {
$has_preconfig = true;
- $description = 'You can now decide whether admins/customers are able to change the theme ';
+ $description = 'You can now decide whether admins/customers are able to change the theme ';
$question = 'If you want to disallow theme-changing, select "no" from the dropdowns: ';
- $question.= "Admins: ". makeyesno('allow_themechange_a', '1', '0', '1').' ';
- $question.= "Customers: ".makeyesno('allow_themechange_c', '1', '0', '1');
+ $question .= "Admins: " . makeyesno('allow_themechange_a', '1', '0', '1') . ' ';
+ $question .= "Customers: " . makeyesno('allow_themechange_c', '1', '0', '1');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if (versionInUpdate($current_version, '0.9.29-dev3')) {
$has_preconfig = true;
- $description = 'There is now a possibility to specify AXFR servers for your bind zone-configuration ';
+ $description = 'There is now a possibility to specify AXFR servers for your bind zone-configuration ';
$question = 'Enter a comma-separated list of AXFR servers or leave empty (default): ';
- $question.= '';
+ $question .= '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if (versionInUpdate($current_version, '0.9.29-dev4')) {
$has_preconfig = true;
- $description = 'As customers can now specify ssl-certificate data for their domains, you need to specify where the generated files are stored ';
+ $description = 'As customers can now specify ssl-certificate data for their domains, you need to specify where the generated files are stored ';
$question = 'Specify the directory for customer ssl-certificates: ';
- $question.= '';
+ $question .= '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if (versionInUpdate($current_version, '0.9.29.1-dev3')) {
$has_preconfig = true;
- $description = 'The build in logrotation-feature has been removed. Please follow the configuration-instructions for your system to enable logrotating again.';
+ $description = 'The build in logrotation-feature has been removed. Please follow the configuration-instructions for your system to enable logrotating again.';
$question = '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
@@ -555,11 +503,9 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
// let the apache+fpm users know that they MUST change their config
// for the domains / webserver to work after the update
if (versionInUpdate($current_version, '0.9.30-dev1')) {
- if (Settings::Get('system.webserver') == 'apache2'
- && Settings::Get('phpfpm.enabled') == '1'
- ) {
+ if (Settings::Get('system.webserver') == 'apache2' && Settings::Get('phpfpm.enabled') == '1') {
$has_preconfig = true;
- $description = 'The PHP-FPM implementation for apache2 has changed. Please look for the "fastcgi.conf" (Debian/Ubuntu) or "70_fastcgi.conf" (Gentoo) within /etc/apache2/ and change it as shown below:
';
+ $description = 'The PHP-FPM implementation for apache2 has changed. Please look for the "fastcgi.conf" (Debian/Ubuntu) or "70_fastcgi.conf" (Gentoo) within /etc/apache2/ and change it as shown below:
';
$description .= '
<IfModule mod_fastcgi.c>
FastCgiIpcDir /var/lib/apache2/fastcgi/
<Location "/fastcgiphp">
@@ -575,11 +521,9 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
}
if (versionInUpdate($current_version, '0.9.31-dev2')) {
- if (Settings::Get('system.webserver') == 'apache2'
- && Settings::Get('phpfpm.enabled') == '1'
- ) {
+ if (Settings::Get('system.webserver') == 'apache2' && Settings::Get('phpfpm.enabled') == '1') {
$has_preconfig = true;
- $description = 'The FPM socket directory is now a setting in froxlor. Its default is /var/lib/apache2/fastcgi/. If you are using /var/run/apache2 in the "fastcgi.conf" (Debian/Ubuntu) or "70_fastcgi.conf" (Gentoo) please correct this path accordingly ';
+ $description = 'The FPM socket directory is now a setting in froxlor. Its default is /var/lib/apache2/fastcgi/. If you are using /var/run/apache2 in the "fastcgi.conf" (Debian/Ubuntu) or "70_fastcgi.conf" (Gentoo) please correct this path accordingly ';
$question = '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
@@ -587,50 +531,50 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
if (versionInUpdate($current_version, '0.9.31-dev4')) {
$has_preconfig = true;
- $description = 'The template-variable {PASSWORD} has been replaced with {LINK}. Please update your password reset templates! ';
+ $description = 'The template-variable {PASSWORD} has been replaced with {LINK}. Please update your password reset templates! ';
$question = '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if (versionInUpdate($current_version, '0.9.31-dev5')) {
$has_preconfig = true;
- $description = 'You can enable/disable error-reporting for admins and customers!
';
+ $description = 'You can enable/disable error-reporting for admins and customers!
';
$question = 'Do you want to enable error-reporting for admins? (default: yes): ';
- $question.= makeyesno('update_error_report_admin', '1', '0', '1').' ';
- $question.= 'Do you want to enable error-reporting for customers? (default: no): ';
- $question.= makeyesno('update_error_report_customer', '1', '0', '0');
+ $question .= makeyesno('update_error_report_admin', '1', '0', '1') . ' ';
+ $question .= 'Do you want to enable error-reporting for customers? (default: no): ';
+ $question .= makeyesno('update_error_report_customer', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if (versionInUpdate($current_version, '0.9.31-rc2')) {
$has_preconfig = true;
- $description = 'You can enable/disable the display/usage of the news-feed for admins
';
+ $description = 'You can enable/disable the display/usage of the news-feed for admins
';
$question = 'Do you want to enable the news-feed for admins? (default: yes): ';
- $question.= makeyesno('update_admin_news_feed', '1', '0', '1').' ';
+ $question .= makeyesno('update_admin_news_feed', '1', '0', '1') . ' ';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if (versionInUpdate($current_version, '0.9.32-dev2')) {
$has_preconfig = true;
- $description = 'To enable logging of the mail-traffic, you need to set the following settings accordingly
';
+ $description = 'To enable logging of the mail-traffic, you need to set the following settings accordingly
';
$question = 'Do you want to enable the traffic collection for mail? (default: yes): ';
- $question.= makeyesno('mailtraffic_enabled', '1', '0', '1').' ';
- $question.= 'Mail Transfer Agent ';
- $question.= 'Type of your MTA: ';
- $question.= ' ';
- $question.= 'Logfile for your MTA: ';
- $question.= ' ';
- $question.= 'Mail Delivery Agent ';
- $question.= 'Type of your MDA: ';
- $question.= '
';
- $question.= 'Logfile for your MDA: ';
- $question.= ' ';
+ $question .= makeyesno('mailtraffic_enabled', '1', '0', '1') . ' ';
+ $question .= 'Mail Transfer Agent ';
+ $question .= 'Type of your MTA: ';
+ $question .= ' ';
+ $question .= 'Logfile for your MTA: ';
+ $question .= ' ';
+ $question .= 'Mail Delivery Agent ';
+ $question .= 'Type of your MDA: ';
+ $question .= '
';
+ $question .= 'Logfile for your MDA: ';
+ $question .= ' ';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
@@ -638,7 +582,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$has_preconfig = true;
$description = 'Froxlor now generates a cron-configuration file for the cron-daemon. Please set a filename which will be included automatically by your crond (e.g. files in /etc/cron.d/)
';
$question = 'Path to the cron-service configuration-file. This file will be updated regularly and automatically by froxlor. Note: please be sure to use the same filename as for the main froxlor cronjob (default: /etc/cron.d/froxlor)! ';
- $question.= ' ';
+ $question .= ' ';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
@@ -646,7 +590,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$has_preconfig = true;
$description = 'In order for the new cron.d file to work properly, we need to know about the cron-service reload command.
';
$question = 'Please specify the reload-command of your cron-daemon (default: /etc/init.d/cron reload) ';
- $question.= ' ';
+ $question .= ' ';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
@@ -654,17 +598,17 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$has_preconfig = true;
$description = 'To customize the command which executes the cronjob (php - basically) change the path below according to your system.
';
$question = 'Please specify the command to execute cronscripts (default: "/usr/bin/nice -n 5 /usr/bin/php5 -q") ';
- $question.= ' ';
+ $question .= ' ';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if (versionInUpdate($current_version, '0.9.33-dev1')) {
$has_preconfig = true;
- $description = 'You can enable/disable the display/usage of the custom newsfeed for customers.
';
+ $description = 'You can enable/disable the display/usage of the custom newsfeed for customers.
';
$question = 'Do you want to enable the custom newsfeed for customer? (default: no): ';
- $question.= makeyesno('customer_show_news_feed', '1', '0', '0').' ';
- $question.= 'You have to set the URL for your RSS-feed here, if you have chosen to enable the custom newsfeed on the customer-dashboard: ';
- $question.= ' ';
+ $question .= makeyesno('customer_show_news_feed', '1', '0', '0') . ' ';
+ $question .= 'You have to set the URL for your RSS-feed here, if you have chosen to enable the custom newsfeed on the customer-dashboard: ';
+ $question .= ' ';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
@@ -672,56 +616,67 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
// only if bind is used - if not the default will be set, which is '0' (off)
if (Settings::get('system.bind_enable') == 1) {
$has_preconfig = true;
- $description = 'You can enable/disable the generation of the bind-zone / config for the system hostname.
';
+ $description = 'You can enable/disable the generation of the bind-zone / config for the system hostname.
';
$question = 'Do you want to generate a bind-zone for the system-hostname? (default: no): ';
- $question.= makeyesno('dns_createhostnameentry', '1', '0', '0').' ';
+ $question .= makeyesno('dns_createhostnameentry', '1', '0', '0') . ' ';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}
if (versionInUpdate($current_version, '0.9.33-rc2')) {
$has_preconfig = true;
- $description = 'You can chose whether you want to receive an e-mail on cronjob errors. Keep in mind that this can lead to an e-mail being sent every 5 minutes.
';
+ $description = 'You can chose whether you want to receive an e-mail on cronjob errors. Keep in mind that this can lead to an e-mail being sent every 5 minutes.
';
$question = 'Do you want to receive cron-errors via mail? (default: no): ';
- $question.= makeyesno('system_send_cron_errors', '1', '0', '0').' ';
+ $question .= makeyesno('system_send_cron_errors', '1', '0', '0') . ' ';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if (versionInUpdate($current_version, '0.9.34-dev3')) {
- $has_preconfig = true;
- $description = 'Froxlor now requires the PHP mbstring-extension as we need to be multibyte-character safe in some cases';
- $question = 'PHP mbstring is currently: ';
- if (!extension_loaded('mbstring')) {
- $question .= 'not installed/loaded';
- $question .= ' Please install the PHP mbstring extension in order to finish the update';
- } else {
- $question .= 'installed/loaded';
- }
- $question .= ' ';
- eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
+ $has_preconfig = true;
+ $description = 'Froxlor now requires the PHP mbstring-extension as we need to be multibyte-character safe in some cases';
+ $question = 'PHP mbstring is currently: ';
+ if (! extension_loaded('mbstring')) {
+ $question .= 'not installed/loaded';
+ $question .= ' Please install the PHP mbstring extension in order to finish the update';
+ } else {
+ $question .= 'installed/loaded';
+ }
+ $question .= ' ';
+ eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if (versionInUpdate($current_db_version, '201603070')) {
- $has_preconfig = true;
- $description = 'You can chose whether you want to enable or disable our Let\'s Encrypt implementation. Please remember that you need to go through the webserver-configuration when enabled because this feature needs a special configuration.
';
- $question = 'Do you want to enable Let\'s Encrypt? (default: yes): ';
- $question.= makeyesno('enable_letsencrypt', '1', '0', '1').' ';
- eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
+ $has_preconfig = true;
+ $description = 'You can chose whether you want to enable or disable our Let\'s Encrypt implementation. Please remember that you need to go through the webserver-configuration when enabled because this feature needs a special configuration.
';
+ $question = 'Do you want to enable Let\'s Encrypt? (default: yes): ';
+ $question .= makeyesno('enable_letsencrypt', '1', '0', '1') . ' ';
+ eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if (versionInUpdate($current_db_version, '201604270')) {
$has_preconfig = true;
- $description = 'You can chose whether you want to enable or disable our backup function.
';
+ $description = 'You can chose whether you want to enable or disable our backup function.
';
$question = 'Do you want to enable Backup? (default: no): ';
- $question.= makeyesno('enable_backup', '1', '0', '0').' ';
+ $question .= makeyesno('enable_backup', '1', '0', '0') . ' ';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if (versionInUpdate($current_db_version, '201605090')) {
$has_preconfig = true;
- $description = 'You can chose whether you want to enable or disable our DNS editor
';
+ $description = 'You can chose whether you want to enable or disable our DNS editor
';
$question = 'Do you want to enable the DNS editor? (default: no): ';
- $question.= makeyesno('enable_dns', '1', '0', '0').' ';
+ $question .= makeyesno('enable_dns', '1', '0', '0') . ' ';
+ eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
+ }
+
+ if (versionInUpdate($current_db_version, '201605170')) {
+ $has_preconfig = true;
+ $description = 'Froxlor now supports the dns-daemon Power-DNS, you can chose between bind and powerdns now.';
+ $question = 'Select dns-daemon you want to use: ';
+ $question .= '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}
diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml
index 1c945572..71374ccb 100644
--- a/lib/configfiles/gentoo.xml
+++ b/lib/configfiles/gentoo.xml
@@ -388,7 +388,547 @@ mail IN A
-
+
+
+
+
+
+#################################
+# allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges.
+#
+# allow-dnsupdate-from=127.0.0.0/8,::1
+
+#################################
+# allow-recursion List of subnets that are allowed to recurse
+#
+allow-recursion=127.0.0.1
+
+#################################
+# also-notify When notifying a domain, also notify these nameservers
+#
+# also-notify=
+
+#################################
+# any-to-tcp Answer ANY queries with tc=1, shunting to TCP
+#
+# any-to-tcp=no
+
+#################################
+# cache-ttl Seconds to store packets in the PacketCache
+#
+# cache-ttl=20
+
+#################################
+# carbon-interval Number of seconds between carbon (graphite) updates
+#
+# carbon-interval=30
+
+#################################
+# carbon-ourname If set, overrides our reported hostname for carbon stats
+#
+# carbon-ourname=
+
+#################################
+# carbon-server If set, send metrics in carbon (graphite) format to this server
+#
+# carbon-server=
+
+#################################
+# chroot If set, chroot to this directory for more security
+#
+# chroot=
+
+#################################
+# config-dir Location of configuration directory (pdns.conf)
+#
+config-dir=/etc/powerdns
+
+#################################
+# config-name Name of this virtual configuration - will rename the binary image
+#
+# config-name=
+
+#################################
+# control-console Debugging switch - don't use
+#
+# control-console=no
+
+#################################
+# daemon Operate as a daemon
+#
+daemon=yes
+
+#################################
+# default-ksk-algorithms Default KSK algorithms
+#
+# default-ksk-algorithms=rsasha256
+
+#################################
+# default-ksk-size Default KSK size (0 means default)
+#
+# default-ksk-size=0
+
+#################################
+# default-soa-mail mail address to insert in the SOA record if none set in the backend
+#
+# default-soa-mail=
+
+#################################
+# default-soa-name name to insert in the SOA record if none set in the backend
+#
+# default-soa-name=a.misconfigured.powerdns.server
+
+#################################
+# default-ttl Seconds a result is valid if not set otherwise
+#
+# default-ttl=3600
+
+#################################
+# default-zsk-algorithms Default ZSK algorithms
+#
+# default-zsk-algorithms=rsasha256
+
+#################################
+# default-zsk-size Default ZSK size (0 means default)
+#
+# default-zsk-size=0
+
+#################################
+# direct-dnskey Fetch DNSKEY RRs from backend during DNSKEY synthesis
+#
+# direct-dnskey=no
+
+#################################
+# disable-axfr Disable zonetransfers but do allow TCP queries
+#
+# disable-axfr=no
+
+#################################
+# disable-axfr-rectify Disable the rectify step during an outgoing AXFR. Only required for regression testing.
+#
+# disable-axfr-rectify=no
+
+#################################
+# disable-tcp Do not listen to TCP queries
+#
+# disable-tcp=no
+
+#################################
+# distributor-threads Default number of Distributor (backend) threads to start
+#
+# distributor-threads=3
+
+#################################
+# do-ipv6-additional-processing Do AAAA additional processing
+#
+# do-ipv6-additional-processing=yes
+
+#################################
+# edns-subnet-processing If we should act on EDNS Subnet options
+#
+# edns-subnet-processing=no
+
+#################################
+# entropy-source If set, read entropy from this file
+#
+# entropy-source=/dev/urandom
+
+#################################
+# experimental-api-key REST API Static authentication key (required for API use)
+#
+# experimental-api-key=
+
+#################################
+# experimental-api-readonly If the JSON API should disallow data modification
+#
+# experimental-api-readonly=no
+
+#################################
+# experimental-dname-processing If we should support DNAME records
+#
+# experimental-dname-processing=no
+
+#################################
+# experimental-dnsupdate Enable/Disable DNS update (RFC2136) support. Default is no.
+#
+# experimental-dnsupdate=no
+
+#################################
+# experimental-json-interface If the webserver should serve JSON data
+#
+# experimental-json-interface=no
+
+#################################
+# experimental-logfile Filename of the log file for JSON parser
+#
+# experimental-logfile=/var/log/pdns.log
+
+#################################
+# forward-dnsupdate A global setting to allow DNS update packages that are for a Slave domain, to be forwarded to the master.
+#
+# forward-dnsupdate=yes
+
+#################################
+# guardian Run within a guardian process
+#
+guardian=yes
+
+#################################
+# include-dir Include *.conf files from this directory
+#
+# include-dir=
+
+#################################
+# launch Which backends to launch and order to query them in
+#
+# launch=
+
+#################################
+# load-modules Load this module - supply absolute or relative path
+#
+# load-modules=
+
+#################################
+# local-address Local IP addresses to which we bind
+#
+local-address=,127.0.0.1
+
+#################################
+# local-address-nonexist-fail Fail to start if one or more of the local-address's do not exist on this server
+#
+# local-address-nonexist-fail=yes
+
+#################################
+# local-ipv6 Local IP address to which we bind
+#
+# local-ipv6=
+
+#################################
+# local-ipv6-nonexist-fail Fail to start if one or more of the local-ipv6 addresses do not exist on this server
+#
+# local-ipv6-nonexist-fail=yes
+
+#################################
+# local-port The port on which we listen
+#
+local-port=53
+
+#################################
+# log-dns-details If PDNS should log DNS non-erroneous details
+#
+log-dns-details=yes
+
+#################################
+# log-dns-queries If PDNS should log all incoming DNS queries
+#
+# log-dns-queries=no
+
+#################################
+# logging-facility Log under a specific facility
+#
+# logging-facility=
+
+#################################
+# loglevel Amount of logging. Higher is more. Do not set below 3
+#
+# loglevel=4
+
+#################################
+# lua-prequery-script Lua script with prequery handler
+#
+# lua-prequery-script=
+
+#################################
+# master Act as a master
+#
+master=yes
+
+#################################
+# max-cache-entries Maximum number of cache entries
+#
+# max-cache-entries=1000000
+
+#################################
+# max-ent-entries Maximum number of empty non-terminals in a zone
+#
+# max-ent-entries=100000
+
+#################################
+# max-nsec3-iterations Limit the number of NSEC3 hash iterations
+#
+# max-nsec3-iterations=500
+
+#################################
+# max-queue-length Maximum queuelength before considering situation lost
+#
+# max-queue-length=5000
+
+#################################
+# max-signature-cache-entries Maximum number of signatures cache entries
+#
+# max-signature-cache-entries=
+
+#################################
+# max-tcp-connections Maximum number of TCP connections
+#
+# max-tcp-connections=10
+
+#################################
+# module-dir Default directory for modules
+#
+module-dir=/usr/lib/powerdns/pdns/
+
+#################################
+# negquery-cache-ttl Seconds to store negative query results in the QueryCache
+#
+# negquery-cache-ttl=60
+
+#################################
+# no-shuffle Set this to prevent random shuffling of answers - for regression testing
+#
+# no-shuffle=off
+
+#################################
+# only-notify Only send AXFR NOTIFY to these IP addresses or netmasks
+#
+# only-notify=0.0.0.0/0,::/0
+
+#################################
+# out-of-zone-additional-processing Do out of zone additional processing
+#
+# out-of-zone-additional-processing=yes
+
+#################################
+# overload-queue-length Maximum queuelength moving to packetcache only
+#
+# overload-queue-length=0
+
+#################################
+# pipebackend-abi-version Version of the pipe backend ABI
+#
+# pipebackend-abi-version=1
+
+#################################
+# prevent-self-notification Don't send notifications to what we think is ourself
+#
+# prevent-self-notification=yes
+
+#################################
+# query-cache-ttl Seconds to store query results in the QueryCache
+#
+# query-cache-ttl=20
+
+#################################
+# query-local-address Source IP address for sending queries
+#
+# query-local-address=0.0.0.0
+
+#################################
+# query-local-address6 Source IPv6 address for sending queries
+#
+# query-local-address6=::
+
+#################################
+# query-logging Hint backends that queries should be logged
+#
+# query-logging=no
+
+#################################
+# queue-limit Maximum number of milliseconds to queue a query
+#
+# queue-limit=1500
+
+#################################
+# receiver-threads Default number of receiver threads to start
+#
+# receiver-threads=1
+
+#################################
+# recursive-cache-ttl Seconds to store packets for recursive queries in the PacketCache
+#
+# recursive-cache-ttl=10
+
+#################################
+# recursor If recursion is desired, IP address of a recursing nameserver
+#
+# recursor=no
+
+#################################
+# retrieval-threads Number of AXFR-retrieval threads for slave operation
+#
+# retrieval-threads=2
+
+#################################
+# reuseport Enable higher performance on compliant kernels by using SO_REUSEPORT allowing each receiver thread to open its own socket
+#
+# reuseport=no
+
+#################################
+# security-poll-suffix Domain name from which to query security update notifications
+#
+# security-poll-suffix=secpoll.powerdns.com.
+
+#################################
+# send-root-referral Send out old-fashioned root-referral instead of ServFail in case of no authority
+#
+# send-root-referral=no
+
+#################################
+# server-id Returned when queried for 'server.id' TXT or NSID, defaults to hostname - disabled or custom
+#
+# server-id=
+
+#################################
+# setgid If set, change group id to this gid for more security
+#
+setgid=pdns
+
+#################################
+# setuid If set, change user id to this uid for more security
+#
+setuid=pdns
+
+#################################
+# signing-threads Default number of signer threads to start
+#
+# signing-threads=3
+
+#################################
+# slave Act as a slave
+#
+# slave=no
+
+#################################
+# slave-cycle-interval Reschedule failed SOA serial checks once every .. seconds
+#
+# slave-cycle-interval=60
+
+#################################
+# slave-renotify If we should send out notifications for slaved updates
+#
+# slave-renotify=no
+
+#################################
+# soa-expire-default Default SOA expire
+#
+# soa-expire-default=604800
+
+#################################
+# soa-minimum-ttl Default SOA minimum ttl
+#
+# soa-minimum-ttl=3600
+
+#################################
+# soa-refresh-default Default SOA refresh
+#
+# soa-refresh-default=10800
+
+#################################
+# soa-retry-default Default SOA retry
+#
+# soa-retry-default=3600
+
+#################################
+# socket-dir Where the controlsocket will live
+#
+socket-dir=/var/run
+
+#################################
+# tcp-control-address If set, PowerDNS can be controlled over TCP on this address
+#
+# tcp-control-address=
+
+#################################
+# tcp-control-port If set, PowerDNS can be controlled over TCP on this address
+#
+# tcp-control-port=53000
+
+#################################
+# tcp-control-range If set, remote control of PowerDNS is possible over these networks only
+#
+# tcp-control-range=127.0.0.0/8, 10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12, ::1/128, fe80::/10
+
+#################################
+# tcp-control-secret If set, PowerDNS can be controlled over TCP after passing this secret
+#
+# tcp-control-secret=
+
+#################################
+# traceback-handler Enable the traceback handler (Linux only)
+#
+# traceback-handler=yes
+
+#################################
+# trusted-notification-proxy IP address of incoming notification proxy
+#
+# trusted-notification-proxy=
+
+#################################
+# udp-truncation-threshold Maximum UDP response size before we truncate
+#
+# udp-truncation-threshold=1680
+
+#################################
+# version-string PowerDNS version in packets - full, anonymous, powerdns or custom
+#
+version-string=powerdns
+
+#################################
+# webserver Start a webserver for monitoring
+#
+# webserver=no
+
+#################################
+# webserver-address IP Address of webserver to listen on
+#
+# webserver-address=127.0.0.1
+
+#################################
+# webserver-allow-from Webserver access is only allowed from these subnets
+#
+# webserver-allow-from=0.0.0.0/0,::/0
+
+#################################
+# webserver-password Password required for accessing the webserver
+#
+# webserver-password=
+
+#################################
+# webserver-port Port of webserver to listen on
+#
+# webserver-port=8081
+
+#################################
+# webserver-print-arguments If the webserver should print arguments
+#
+# webserver-print-arguments=no
+
+# include froxlor-bind-specific config
+include=/etc/powerdns/pdns_froxlor.conf
+]]>
+
+
+
+
+
+
+
+
+ (2003-2009)
- * @author Froxlor team (2010-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Cron
+ * @copyright (c) the authors
+ * @author Froxlor team (2016-)
+ * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package Cron
*
*/
+class bind extends DnsBase
+{
-class bind {
- public $logger = false;
- public $nameservers = array();
- public $mxservers = array();
- public $axfrservers = array();
+ public function writeConfigs()
+ {
+ // tell the world what we are doing
+ $this->_logger->logAction(CRON_ACTION, LOG_INFO, 'Task4 started - Rebuilding froxlor_bind.conf');
- private $_known_filenames = array();
- private $_bindconf_file = '';
+ // clean up
+ $this->_cleanZonefiles();
- public function __construct($logger) {
+ // check for subfolder in bind-config-directory
+ if (! file_exists(makeCorrectDir(Settings::Get('system.bindconf_directory') . '/domains/'))) {
+ $this->_logger->logAction(CRON_ACTION, LOG_NOTICE, 'mkdir ' . escapeshellarg(makeCorrectDir(Settings::Get('system.bindconf_directory') . '/domains/')));
+ safe_exec('mkdir -p ' . escapeshellarg(makeCorrectDir(Settings::Get('system.bindconf_directory') . '/domains/')));
+ }
- $this->logger = $logger;
+ $domains = $this->getDomainList();
- if (Settings::Get('system.nameservers') != '') {
- $nameservers = explode(',', Settings::Get('system.nameservers'));
- foreach ($nameservers as $nameserver) {
- $nameserver = trim($nameserver);
- // DNS servers might be multi homed; allow transfer from all ip
- // addresses of the DNS server
- $nameserver_ips = gethostbynamel($nameserver);
- // append dot to hostname
- if (substr($nameserver, -1, 1) != '.') {
- $nameserver.= '.';
+ if (! empty($domains)) {
+ $bindconf_file = '# ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf' . "\n" . '# Created ' . date('d.m.Y H:i') . "\n" . '# Do NOT manually edit this file, all changes will be deleted after the next domain change at the panel.' . "\n\n";
+
+ foreach ($domains as $domain) {
+ // check for system-hostname
+ $isFroxlorHostname = false;
+ if (isset($domain['froxlorhost']) && $domain['froxlorhost'] == 1) {
+ $isFroxlorHostname = true;
}
- // ignore invalid responses
- if (!is_array($nameserver_ips)) {
- // act like gethostbyname() and return unmodified hostname on error
- $nameserver_ips = array($nameserver);
- }
- $this->nameservers[] = array(
- 'hostname' => $nameserver,
- 'ips' => $nameserver_ips
- );
- }
- }
-
- if (Settings::Get('system.mxservers') != '') {
- $mxservers = explode(',', Settings::Get('system.mxservers'));
- foreach ($mxservers as $mxserver) {
- if (substr($mxserver, -1, 1) != '.') {
- $mxserver.= '.';
- }
- $this->mxservers[] = $mxserver;
- }
- }
-
- // AXFR server #100
- if (Settings::Get('system.axfrservers') != '') {
- $axfrservers = explode(',', Settings::Get('system.axfrservers'));
- foreach ($axfrservers as $axfrserver) {
- $this->axfrservers[] = trim($axfrserver);
- }
- }
- }
-
-
- public function writeConfigs() {
- $this->logger->logAction(CRON_ACTION, LOG_INFO, 'Task4 started - Rebuilding froxlor_bind.conf');
-
- if (!file_exists(makeCorrectDir(Settings::Get('system.bindconf_directory') . '/domains/'))) {
- $this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'mkdir ' . escapeshellarg(makeCorrectDir(Settings::Get('system.bindconf_directory') . '/domains/')));
- safe_exec('mkdir ' . escapeshellarg(makeCorrectDir(Settings::Get('system.bindconf_directory') . '/domains/')));
- }
-
- $this->_known_filenames = array();
-
- $this->_bindconf_file = '# ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf' . "\n" .
- '# Created ' . date('d.m.Y H:i') . "\n" .
- '# Do NOT manually edit this file, all changes will be deleted after the next domain change at the panel.' . "\n" . "\n";
- $result_domains_stmt = Database::query("
- SELECT `d`.`id`, `d`.`domain`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`wwwserveralias`, `d`.`customerid`,
- `d`.`zonefile`, `d`.`bindserial`, `d`.`dkim`, `d`.`dkim_id`, `d`.`dkim_pubkey`, `d`.`ismainbutsubto`,
- `c`.`loginname`, `c`.`guid`
- FROM `" . TABLE_PANEL_DOMAINS . "` `d` LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`)
- WHERE `d`.`isbinddomain` = '1' ORDER BY `d`.`domain` ASC
- ");
-
- $domains = array();
-
- // don't use fetchall() to be able to set the first column to the domain id and use it later on to set the rows'
- // array of direct children without having to search the outer array
- while ($domain = $result_domains_stmt->fetch(PDO::FETCH_ASSOC)) {
- $domains[$domain["id"]] = $domain;
- }
-
- // frolxor-hostname (#1090)
- if (Settings::get('system.dns_createhostnameentry') == 1) {
- $hostname_arr = array(
- 'id' => 'none',
- 'domain' => Settings::Get('system.hostname'),
- 'isemaildomain' => Settings::Get('system.dns_createmailentry'),
- 'customerid' => 'none',
- 'loginname' => 'froxlor.panel',
- 'bindserial' => date('Ymd').'00',
- 'dkim' => '0',
- 'iswildcarddomain' => '1',
- 'ismainbutsubto' => '0',
- 'zonefile' => '',
- 'froxlorhost' => '1'
- );
- $domains['none'] = $hostname_arr;
- }
-
- if (empty($domains)) {
- $this->logger->logAction(CRON_ACTION, LOG_INFO, 'No domains found for nameserver-config, skipping...');
- return;
- }
-
- // collect domain IDs of direct child domains as arrays in ['children'] column
- foreach (array_keys($domains) as $key) {
- if (!isset($domains[$key]['children'])) {
- $domains[$key]['children'] = array();
- }
- if ($domains[$key]['ismainbutsubto'] > 0) {
- if (isset($domains[ $domains[$key]['ismainbutsubto'] ])) {
- $domains[ $domains[$key]['ismainbutsubto'] ]['children'][] = $domains[$key]['id'];
- } else {
- $this->logger->logAction(CRON_ACTION, LOG_ERR,
- 'Database inconsistency: domain ' . $domain['domain'] . ' (ID #' . $key .
- ') is set to to be subdomain to non-existent domain ID #' .
- $domains[$key]['ismainbutsubto'] .
- '. No DNS record(s) will be created for this domain.');
- }
- }
- }
-
- $this->logger->logAction(CRON_ACTION, LOG_DEBUG,
- str_pad('domId', 9, ' ') . str_pad('domain', 40, ' ') .
- 'ismainbutsubto ' . str_pad('parent domain', 40, ' ') .
- "list of child domain ids");
- foreach ($domains as $domain) {
- $logLine =
- str_pad($domain['id'], 9, ' ') .
- str_pad($domain['domain'], 40, ' ') .
- str_pad($domain['ismainbutsubto'], 15, ' ') .
- str_pad(((isset($domains[ $domain['ismainbutsubto'] ])) ?
- $domains[ $domain['ismainbutsubto'] ]['domain'] :
- '-'), 40, ' ') .
- join(', ', $domain['children']);
- $this->logger->logAction(CRON_ACTION, LOG_DEBUG, $logLine);
- }
-
- foreach ($domains as $domain) {
- if ($domain['ismainbutsubto'] > 0) {
- // domains with ismainbutsubto>0 are handled by recursion within walkDomainList()
- continue;
- }
- $this->walkDomainList($domain, $domains);
- }
-
- $bindconf_file_handler = fopen(makeCorrectFile(Settings::Get('system.bindconf_directory') . '/froxlor_bind.conf'), 'w');
- fwrite($bindconf_file_handler, $this->_bindconf_file);
- fclose($bindconf_file_handler);
- $this->logger->logAction(CRON_ACTION, LOG_INFO, 'froxlor_bind.conf written');
- safe_exec(escapeshellcmd(Settings::Get('system.bindreload_command')));
- $this->logger->logAction(CRON_ACTION, LOG_INFO, 'Bind9 reloaded');
- $domains_dir = makeCorrectDir(Settings::Get('system.bindconf_directory') . '/domains/');
-
- if (file_exists($domains_dir)
- && is_dir($domains_dir)) {
- $domain_file_dirhandle = opendir($domains_dir);
-
- while (false !== ($domain_filename = readdir($domain_file_dirhandle))) {
- $full_filename = makeCorrectFile($domains_dir . '/' . $domain_filename);
-
- if ($domain_filename != '.'
- && $domain_filename != '..'
- && !in_array($domain_filename, $this->_known_filenames)
- && is_file($full_filename)
- && file_exists($full_filename)) {
- $this->logger->logAction(CRON_ACTION, LOG_WARNING, 'Deleting ' . $domain_filename);
- unlink(makeCorrectFile($domains_dir . '/' . $domain_filename));
- }
- }
- }
- $this->logger->logAction(CRON_ACTION, LOG_INFO, 'Task4 finished');
- }
-
- private function walkDomainList($domain, $domains) {
- $zonefile = '';
- $subzones = '';
-
- foreach($domain['children'] as $child_domain_id) {
- $subzones.= $this->walkDomainList($domains[$child_domain_id], $domains);
- }
-
- if ($domain['zonefile'] == '') {
- if ($domain['ismainbutsubto'] == 0) {
- $zonefile = $this->generateZone($domain);
+ // create zone-file
+ $this->_logger->logAction(CRON_ACTION, LOG_DEBUG, 'Generating dns zone for ' . $domain['domain']);
+ $zone = createDomainZone($domain['id'], $isFroxlorHostname);
+ $zonefile = (string)$zone;
$domain['zonefile'] = 'domains/' . $domain['domain'] . '.zone';
$zonefile_name = makeCorrectFile(Settings::Get('system.bindconf_directory') . '/' . $domain['zonefile']);
- $this->_known_filenames[] = basename($zonefile_name);
$zonefile_handler = fopen($zonefile_name, 'w');
- fwrite($zonefile_handler, $zonefile.$subzones);
+ fwrite($zonefile_handler, $zonefile);
fclose($zonefile_handler);
- $this->logger->logAction(CRON_ACTION, LOG_INFO, '`' . $zonefile_name . '` zone written');
- $this->_bindconf_file .= $this->_generateDomainConfig($domain);
- } else {
- return $this->generateZone($domain);
+ $this->_logger->logAction(CRON_ACTION, LOG_INFO, '`' . $zonefile_name . '` zone written');
+
+ // generate config
+ $bindconf_file .= $this->_generateDomainConfig($domain);
}
- } else {
- $this->logger->logAction(CRON_ACTION, LOG_INFO, 'Added zonefile ' . $domain['zonefile'] . ' for domain ' . $domain['domain'] .
- ' - Note that you will also have to handle ALL records for ALL subdomains.');
- $this->_bindconf_file .= $this->_generateDomainConfig($domain);
+
+ // write config
+ $bindconf_file_handler = fopen(makeCorrectFile(Settings::Get('system.bindconf_directory') . '/froxlor_bind.conf'), 'w');
+ fwrite($bindconf_file_handler, $bindconf_file);
+ fclose($bindconf_file_handler);
+ $this->_logger->logAction(CRON_ACTION, LOG_INFO, 'froxlor_bind.conf written');
+
+ // reload Bind
+ safe_exec(escapeshellcmd(Settings::Get('system.bindreload_command')));
+ $this->_logger->logAction(CRON_ACTION, LOG_INFO, 'Bind9 reloaded');
}
}
- private function _generateDomainConfig($domain = array()) {
- if (isset($domain['froxlorhost']) && $domain['froxlorhost'] === '1') {
- $froxlorhost = true;
- } else {
- $froxlorhost = false;
- }
+ private function _generateDomainConfig($domain = array())
+ {
+ $this->_logger->logAction(CRON_ACTION, LOG_DEBUG, 'Generating dns config for ' . $domain['domain']);
$bindconf_file = '# Domain ID: ' . $domain['id'] . ' - CustomerID: ' . $domain['customerid'] . ' - CustomerLogin: ' . $domain['loginname'] . "\n";
- $bindconf_file.= 'zone "' . $domain['domain'] . '" in {' . "\n";
- $bindconf_file.= ' type master;' . "\n";
- $bindconf_file.= ' file "' . makeCorrectFile(Settings::Get('system.bindconf_directory') . '/' . $domain['zonefile']) . '";' . "\n";
- $bindconf_file.= ' allow-query { any; };' . "\n";
+ $bindconf_file .= 'zone "' . $domain['domain'] . '" in {' . "\n";
+ $bindconf_file .= ' type master;' . "\n";
+ $bindconf_file .= ' file "' . makeCorrectFile(Settings::Get('system.bindconf_directory') . '/' . $domain['zonefile']) . '";' . "\n";
+ $bindconf_file .= ' allow-query { any; };' . "\n";
- if (count($this->nameservers) > 0
- || count($this->axfrservers) > 0
- ) {
+ if (count($this->_ns) > 0 || count($this->_axfr) > 0) {
// open allow-transfer
- $bindconf_file.= ' allow-transfer {' . "\n";
+ $bindconf_file .= ' allow-transfer {' . "\n";
// put nameservers in allow-transfer
- if (count($this->nameservers) > 0) {
- foreach ($this->nameservers as $ns) {
- foreach($ns["ips"] as $ip) {
- $bindconf_file.= ' ' . $ip . ";\n";
+ if (count($this->_ns) > 0) {
+ foreach ($this->_ns as $ns) {
+ foreach ($ns["ips"] as $ip) {
+ $bindconf_file .= ' ' . $ip . ";\n";
}
}
}
// AXFR server #100
- if (count($this->axfrservers) > 0) {
- foreach ($this->axfrservers as $axfrserver) {
+ if (count($this->_axfr) > 0) {
+ foreach ($this->_axfr as $axfrserver) {
if (validate_ip($axfrserver, true) !== false) {
- $bindconf_file.= ' ' . $axfrserver . ';' . "\n";
+ $bindconf_file .= ' ' . $axfrserver . ';' . "\n";
}
}
}
// close allow-transfer
- $bindconf_file.= ' };' . "\n";
+ $bindconf_file .= ' };' . "\n";
}
- $bindconf_file.= '};' . "\n";
- $bindconf_file.= "\n";
+ $bindconf_file .= '};' . "\n";
+ $bindconf_file .= "\n";
return $bindconf_file;
}
- /**
- * generate bind zone content.
- *
- * @param array $domain
- *
- * @return string
- */
- protected function generateZone($domain) {
- if (isset($domain['froxlorhost']) && $domain['froxlorhost'] === '1') {
- $froxlorhost = true;
- } else {
- $froxlorhost = false;
- }
+ private function _cleanZonefiles()
+ {
+ $config_dir = makeCorrectFile(Settings::Get('system.bindconf_directory') . '/domains/');
- // Array to save all ips needed in the records (already including IN A/AAAA)
- $ip_a_records = array();
- // Array to save DNS records
- $records = array();
+ $this->_logger->logAction(CRON_ACTION, LOG_INFO, 'Cleaning dns zone files from ' . $config_dir);
- $domainidquery = '';
- $query_params = array();
- if (!$froxlorhost) {
+ // check directory
+ if (@is_dir($config_dir)) {
- $domainidquery = "`di`.`id_domain` = :domainid AND ";
- $query_params['domainid'] = $domain['id'];
+ // create directory iterator
+ $its = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($config_dir));
- $result_ip_stmt = Database::prepare("
- SELECT `p`.`ip` AS `ip`
- FROM `".TABLE_PANEL_IPSANDPORTS."` `p`, `".TABLE_DOMAINTOIP."` `di`
- WHERE ".$domainidquery."`p`.`id` = `di`.`id_ipandports`
- GROUP BY `p`.`ip`;
- ");
- } else {
- // use all available IP's for the froxlor-hostname
- $result_ip_stmt = Database::prepare("
- SELECT `ip` FROM `".TABLE_PANEL_IPSANDPORTS."` GROUP BY `ip`
- ");
- }
- Database::pexecute($result_ip_stmt, $query_params);
-
- while ($ip = $result_ip_stmt->fetch(PDO::FETCH_ASSOC)) {
-
- if (filter_var($ip['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
- $ip_a_records[] = "A\t\t" . $ip['ip'];
- }
- elseif (filter_var($ip['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
- $ip_a_records[] = "AAAA\t\t" . $ip['ip'];
- }
- else {
- return ";Error in at least one IP Address (".$ip['ip']."), could not create zonefile!";
- }
- }
-
- if ($domain['ismainbutsubto'] == 0) {
- $date = date('Ymd');
- $bindserial = (preg_match('/^' . $date . '/', $domain['bindserial']) ? $domain['bindserial'] + 1 : $date . '00');
-
- if (!$froxlorhost) {
- $upd_stmt = Database::prepare("
- UPDATE `" . TABLE_PANEL_DOMAINS . "` SET
- `bindserial` = :serial
- WHERE `id` = :id
- ");
- Database::pexecute($upd_stmt, array('serial' => $bindserial, 'id' => $domain['id']));
- }
-
- $zonefile = '$TTL ' . (int)Settings::Get('system.defaultttl') . "\n";
- if (count($this->nameservers) == 0) {
- $zonefile.= '@ IN SOA ns ' . str_replace('@', '.', Settings::Get('panel.adminmail')) . '. (' . "\n";
- } else {
- $zonefile.= '@ IN SOA ' . $this->nameservers[0]['hostname'] . ' ' . str_replace('@', '.', Settings::Get('panel.adminmail')) . '. (' . "\n";
- }
-
- $zonefile.= ' ' . $bindserial . ' ; serial' . "\n" . ' 8H ; refresh' . "\n" . ' 2H ; retry' . "\n" . ' 1W ; expiry' . "\n" . ' 11h) ; minimum' . "\n";
-
- // no nameservers given, use all of the A/AAAA entries
- if (count($this->nameservers) == 0) {
- $zonefile .= '@ IN NS ns' . "\n";
- foreach ($ip_a_records as $ip_a_record) {
- $zonefile .= 'ns IN ' . $ip_a_record . "\n";
- }
- } else {
- foreach ($this->nameservers as $nameserver) {
- $zonefile.= '@ IN NS ' . trim($nameserver['hostname']) . "\n";
+ // iterate through all subdirs, look for zone files and delete them
+ foreach ($its as $it) {
+ if ($it->isFile()) {
+ // remove file
+ safe_exec('rm -f ' . escapeshellarg(makeCorrectFile($its->getPathname())));
}
}
- } else {
- $zonefile = '$ORIGIN ' . $domain["domain"] . ".\n";
- }
-
- if ($domain['isemaildomain'] === '1') {
- if (count($this->mxservers) == 0) {
- $zonefile.= '@ IN MX 10 mail' . "\n";
- $records[] = 'mail';
- if ($domain['iswildcarddomain'] != '1') {
- $records[] = 'imap';
- $records[] = 'smtp';
- $records[] = 'pop3';
- }
- } else {
- foreach ($this->mxservers as $mxserver) {
- $zonefile.= '@ IN MX ' . trim($mxserver) . "\n";
- }
-
- if (Settings::Get('system.dns_createmailentry') == '1') {
- $records[] = 'mail';
- if ($domain['iswildcarddomain'] != '1') {
- $records[] = 'imap';
- $records[] = 'smtp';
- $records[] = 'pop3';
- }
- }
- }
-
- /*
- * @TODO domain-based spf-settings
- */
- if (Settings::Get('spf.use_spf') == '1'
- /*&& $domain['spf'] == '1' */
- ) {
- $zonefile.= Settings::Get('spf.spf_entry') . "\n";
- if (in_array('mail', $records)) {
- $zonefile.= str_replace('@', 'mail', Settings::Get('spf.spf_entry')) . "\n";
- }
- }
- }
-
- /**
- * generate dkim-zone-entries
- */
- $zonefile.= $this->generateDkim($domain);
-
- if (!$froxlorhost) {
- $nssubdomains_stmt = Database::prepare("
- SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
- WHERE `isbinddomain` = '1' AND `ismainbutsubto` = '0' AND `domain` LIKE :domain
- ");
- Database::pexecute($nssubdomains_stmt, array('domain' => '%.' . $domain['domain']));
-
- while ($nssubdomain = $nssubdomains_stmt->fetch(PDO::FETCH_ASSOC)) {
-
- if (preg_match('/^[^\.]+\.' . preg_quote($domain['domain'], '/') . '/', $nssubdomain['domain'])) {
-
- $nssubdomain = str_replace('.' . $domain['domain'], '', $nssubdomain['domain']);
-
- if (count($this->nameservers) == 0) {
- $zonefile.= $nssubdomain . ' IN NS ns.' . $nssubdomain . "\n";
- } else {
- foreach ($this->nameservers as $nameserver) {
- $zonefile.= $nssubdomain . ' IN NS ' . trim($nameserver['hostname']) . "\n";
- }
- }
- }
- }
- }
-
- $records[] = '@';
-
- if ($domain['iswildcarddomain'] == '1') {
- $records[] = '*';
- } else if ($domain['wwwserveralias'] == '1') {
- $records[] = 'www';
- }
-
- if (!$froxlorhost) {
- $subdomains_stmt = Database::prepare("
- SELECT `domain` FROM `".TABLE_PANEL_DOMAINS."`
- WHERE `parentdomainid` = :domainid
- ");
- Database::pexecute($subdomains_stmt, array('domainid' => $domain['id']));
-
- while ($subdomain = $subdomains_stmt->fetch(PDO::FETCH_ASSOC)) {
- // Listing domains is enough as there currently is no support for choosing
- // different ips for a subdomain => use same IPs as toplevel
- $records[] = str_replace('.' . $domain['domain'], '', $subdomain['domain']);
-
- // Check whether to add a www.-prefix
- if ($domain['wwwserveralias'] == '1') {
- $records[] = 'www.'.str_replace('.' . $domain['domain'], '', $subdomain['domain']);
- }
- }
- }
-
- // Create DNS-Records for every name we have saved
- foreach ($records as $record) {
- // we create an entry for every ip we have saved
- foreach ($ip_a_records as $ip_a_record) {
- $zonefile.= $record . "\tIN\t" . $ip_a_record . "\n";
- }
- }
-
- return $zonefile;
- }
-
-
- private function generateDkim($domain) {
- $zone_dkim = '';
-
- if (Settings::Get('dkim.use_dkim') == '1'
- && $domain['dkim'] == '1'
- && $domain['dkim_pubkey'] != '') {
- // start
- $dkim_txt = 'v=DKIM1;';
-
- // algorithm
- $algorithm = explode(',', Settings::Get('dkim.dkim_algorithm'));
- $alg = '';
- foreach ($algorithm as $a) {
- if ($a == 'all') {
- break;
- } else {
- $alg.=$a.':';
- }
- }
-
- if ($alg != '') {
- $alg = substr($alg, 0, -1);
- $dkim_txt.= 'h='.$alg.';';
- }
-
- // notes
- if (trim(Settings::Get('dkim.dkim_notes') != '')) {
- $dkim_txt.= 'n='.trim(Settings::Get('dkim.dkim_notes')).';';
- }
-
- // key
- $dkim_txt.= 'k=rsa;p='.trim(preg_replace('/-----BEGIN PUBLIC KEY-----(.+)-----END PUBLIC KEY-----/s', '$1', str_replace("\n", '', $domain['dkim_pubkey']))).';';
-
- // service-type
- if (Settings::Get('dkim.dkim_servicetype') == '1') {
- $dkim_txt.= 's=email;';
- }
-
- // end-part
- $dkim_txt.='t=s';
-
- // split if necessary
- $txt_record_split='';
- $lbr=50;
- for ($pos=0; $pos<=strlen($dkim_txt)-1; $pos+=$lbr) {
- $txt_record_split.= (($pos==0) ? '("' : "\t\t\t\t\t \"") . substr($dkim_txt, $pos, $lbr) . (($pos>=strlen($dkim_txt)-$lbr) ? '")' : '"' ) ."\n";
- }
-
- // dkim-entry
- $zone_dkim .= 'dkim_' . $domain['dkim_id'] . '._domainkey IN TXT ' . $txt_record_split;
-
- // adsp-entry
- if (Settings::Get('dkim.dkim_add_adsp') == "1") {
-
- $zone_dkim .= '_adsp._domainkey IN TXT "dkim=';
- switch ((int)Settings::Get('dkim.dkim_add_adsppolicy')) {
- case 0:
- $zone_dkim .= 'unknown"'. "\n";
- break;
- case 1:
- $zone_dkim .= 'all"'. "\n";
- break;
- case 2:
- $zone_dkim .= 'discardable"'. "\n";
- break;
- }
- }
- }
-
- return $zone_dkim;
- }
-
-
- public function writeDKIMconfigs() {
- if (Settings::Get('dkim.use_dkim') == '1') {
- if (!file_exists(makeCorrectDir(Settings::Get('dkim.dkim_prefix')))) {
- $this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'mkdir -p ' . escapeshellarg(makeCorrectDir(Settings::Get('dkim.dkim_prefix'))));
- safe_exec('mkdir -p ' . escapeshellarg(makeCorrectDir(Settings::Get('dkim.dkim_prefix'))));
- }
-
- $dkimdomains = '';
- $dkimkeys = '';
- $result_domains_stmt = Database::query("
- SELECT `id`, `domain`, `dkim`, `dkim_id`, `dkim_pubkey`, `dkim_privkey`
- FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `dkim` = '1' ORDER BY `id` ASC
- ");
-
- while ($domain = $result_domains_stmt->fetch(PDO::FETCH_ASSOC)) {
-
- $privkey_filename = makeCorrectFile(Settings::Get('dkim.dkim_prefix') . '/dkim_' . $domain['dkim_id']);
- $pubkey_filename = makeCorrectFile(Settings::Get('dkim.dkim_prefix') . '/dkim_' . $domain['dkim_id'] . '.public');
-
- if ($domain['dkim_privkey'] == ''
- || $domain['dkim_pubkey'] == '') {
- $max_dkim_id_stmt = Database::query("SELECT MAX(`dkim_id`) as `max_dkim_id` FROM `" . TABLE_PANEL_DOMAINS . "`");
- $max_dkim_id = $max_dkim_id_stmt->fetch(PDO::FETCH_ASSOC);
- $domain['dkim_id'] = (int)$max_dkim_id['max_dkim_id'] + 1;
- $privkey_filename = makeCorrectFile(Settings::Get('dkim.dkim_prefix') . '/dkim_' . $domain['dkim_id']);
- safe_exec('openssl genrsa -out ' . escapeshellarg($privkey_filename) . ' ' . Settings::Get('dkim.dkim_keylength'));
- $domain['dkim_privkey'] = file_get_contents($privkey_filename);
- safe_exec("chmod 0640 " . escapeshellarg($privkey_filename));
- $pubkey_filename = makeCorrectFile(Settings::Get('dkim.dkim_prefix') . '/dkim_' . $domain['dkim_id'] . '.public');
- safe_exec('openssl rsa -in ' . escapeshellarg($privkey_filename) . ' -pubout -outform pem -out ' . escapeshellarg($pubkey_filename));
- $domain['dkim_pubkey'] = file_get_contents($pubkey_filename);
- safe_exec("chmod 0664 " . escapeshellarg($pubkey_filename));
- $upd_stmt = Database::prepare("
- UPDATE `" . TABLE_PANEL_DOMAINS . "` SET
- `dkim_id` = :dkimid,
- `dkim_privkey` = :privkey,
- `dkim_pubkey` = :pubkey
- WHERE `id` = :id
- ");
- $upd_data = array(
- 'dkimid' => $domain['dkim_id'],
- 'privkey' => $domain['dkim_privkey'],
- 'pubkey' => $domain['dkim_pubkey'],
- 'id' => $domain['id']
- );
- Database::pexecute($upd_stmt, $upd_data);
- }
-
- if (!file_exists($privkey_filename)
- && $domain['dkim_privkey'] != '') {
- $privkey_file_handler = fopen($privkey_filename, "w");
- fwrite($privkey_file_handler, $domain['dkim_privkey']);
- fclose($privkey_file_handler);
- safe_exec("chmod 0640 " . escapeshellarg($privkey_filename));
- }
-
- if (!file_exists($pubkey_filename)
- && $domain['dkim_pubkey'] != '') {
- $pubkey_file_handler = fopen($pubkey_filename, "w");
- fwrite($pubkey_file_handler, $domain['dkim_pubkey']);
- fclose($pubkey_file_handler);
- safe_exec("chmod 0664 " . escapeshellarg($pubkey_filename));
- }
-
- $dkimdomains.= $domain['domain'] . "\n";
- $dkimkeys.= "*@" . $domain['domain'] . ":" . $domain['domain'] . ":" . $privkey_filename . "\n";
- }
-
- $dkimdomains_filename = makeCorrectFile(Settings::Get('dkim.dkim_prefix') . '/' . Settings::Get('dkim.dkim_domains'));
- $dkimdomains_file_handler = fopen($dkimdomains_filename, "w");
- fwrite($dkimdomains_file_handler, $dkimdomains);
- fclose($dkimdomains_file_handler);
- $dkimkeys_filename = makeCorrectFile(Settings::Get('dkim.dkim_prefix') . '/' . Settings::Get('dkim.dkim_dkimkeys'));
- $dkimkeys_file_handler = fopen($dkimkeys_filename, "w");
- fwrite($dkimkeys_file_handler, $dkimkeys);
- fclose($dkimkeys_file_handler);
-
- safe_exec(escapeshellcmd(Settings::Get('dkim.dkimrestart_command')));
- $this->logger->logAction(CRON_ACTION, LOG_INFO, 'Dkim-milter reloaded');
}
}
}
diff --git a/scripts/jobs/cron_tasks.inc.dns.15.bind.php b/scripts/jobs/cron_tasks.inc.dns.15.bind.php
deleted file mode 100644
index 4c368be2..00000000
--- a/scripts/jobs/cron_tasks.inc.dns.15.bind.php
+++ /dev/null
@@ -1,134 +0,0 @@
- (2016-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Cron
- *
- */
-class bind2 extends DnsBase
-{
-
- public function writeConfigs()
- {
- // tell the world what we are doing
- $this->_logger->logAction(CRON_ACTION, LOG_INFO, 'Task4 started - Rebuilding froxlor_bind.conf');
-
- // clean up
- $this->_cleanZonefiles();
-
- // check for subfolder in bind-config-directory
- if (! file_exists(makeCorrectDir(Settings::Get('system.bindconf_directory') . '/domains/'))) {
- $this->_logger->logAction(CRON_ACTION, LOG_NOTICE, 'mkdir ' . escapeshellarg(makeCorrectDir(Settings::Get('system.bindconf_directory') . '/domains/')));
- safe_exec('mkdir -p ' . escapeshellarg(makeCorrectDir(Settings::Get('system.bindconf_directory') . '/domains/')));
- }
-
- $domains = $this->getDomainList();
-
- if (! empty($domains)) {
- $bindconf_file = '# ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf' . "\n" . '# Created ' . date('d.m.Y H:i') . "\n" . '# Do NOT manually edit this file, all changes will be deleted after the next domain change at the panel.' . "\n\n";
-
- foreach ($domains as $domain) {
- // check for system-hostname
- $isFroxlorHostname = false;
- if (isset($domain['froxlorhost']) && $domain['froxlorhost'] == 1) {
- $isFroxlorHostname = true;
- }
- // create zone-file
- $this->_logger->logAction(CRON_ACTION, LOG_DEBUG, 'Generating dns zone for ' . $domain['domain']);
- $zone = createDomainZone($domain['id'], $isFroxlorHostname);
- $zonefile = (string)$zone;
- $domain['zonefile'] = 'domains/' . $domain['domain'] . '.zone';
- $zonefile_name = makeCorrectFile(Settings::Get('system.bindconf_directory') . '/' . $domain['zonefile']);
- $zonefile_handler = fopen($zonefile_name, 'w');
- fwrite($zonefile_handler, $zonefile);
- fclose($zonefile_handler);
- $this->_logger->logAction(CRON_ACTION, LOG_INFO, '`' . $zonefile_name . '` zone written');
-
- // generate config
- $bindconf_file .= $this->_generateDomainConfig($domain);
- }
-
- // write config
- $bindconf_file_handler = fopen(makeCorrectFile(Settings::Get('system.bindconf_directory') . '/froxlor_bind.conf'), 'w');
- fwrite($bindconf_file_handler, $bindconf_file);
- fclose($bindconf_file_handler);
- $this->_logger->logAction(CRON_ACTION, LOG_INFO, 'froxlor_bind.conf written');
-
- // reload Bind
- safe_exec(escapeshellcmd(Settings::Get('system.bindreload_command')));
- $this->_logger->logAction(CRON_ACTION, LOG_INFO, 'Bind9 reloaded');
- }
- }
-
- private function _generateDomainConfig($domain = array())
- {
- $this->_logger->logAction(CRON_ACTION, LOG_DEBUG, 'Generating dns config for ' . $domain['domain']);
-
- $bindconf_file = '# Domain ID: ' . $domain['id'] . ' - CustomerID: ' . $domain['customerid'] . ' - CustomerLogin: ' . $domain['loginname'] . "\n";
- $bindconf_file .= 'zone "' . $domain['domain'] . '" in {' . "\n";
- $bindconf_file .= ' type master;' . "\n";
- $bindconf_file .= ' file "' . makeCorrectFile(Settings::Get('system.bindconf_directory') . '/' . $domain['zonefile']) . '";' . "\n";
- $bindconf_file .= ' allow-query { any; };' . "\n";
-
- if (count($this->_ns) > 0 || count($this->_axfr) > 0) {
- // open allow-transfer
- $bindconf_file .= ' allow-transfer {' . "\n";
- // put nameservers in allow-transfer
- if (count($this->_ns) > 0) {
- foreach ($this->_ns as $ns) {
- foreach ($ns["ips"] as $ip) {
- $bindconf_file .= ' ' . $ip . ";\n";
- }
- }
- }
- // AXFR server #100
- if (count($this->_axfr) > 0) {
- foreach ($this->_axfr as $axfrserver) {
- if (validate_ip($axfrserver, true) !== false) {
- $bindconf_file .= ' ' . $axfrserver . ';' . "\n";
- }
- }
- }
- // close allow-transfer
- $bindconf_file .= ' };' . "\n";
- }
-
- $bindconf_file .= '};' . "\n";
- $bindconf_file .= "\n";
-
- return $bindconf_file;
- }
-
- private function _cleanZonefiles()
- {
- $config_dir = makeCorrectFile(Settings::Get('system.bindconf_directory') . '/domains/');
-
- $this->_logger->logAction(CRON_ACTION, LOG_INFO, 'Cleaning dns zone files from ' . $config_dir);
-
- // check directory
- if (@is_dir($config_dir)) {
-
- // create directory iterator
- $its = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($config_dir));
-
- // iterate through all subdirs, look for zone files and delete them
- foreach ($its as $it) {
- if ($it->isFile()) {
- // remove file
- safe_exec('rm -f ' . escapeshellarg(makeCorrectFile($its->getPathname())));
- }
- }
- }
- }
-}
diff --git a/scripts/jobs/cron_tasks.inc.dns.20.pdns.php b/scripts/jobs/cron_tasks.inc.dns.20.pdns.php
new file mode 100644
index 00000000..61b11ec1
--- /dev/null
+++ b/scripts/jobs/cron_tasks.inc.dns.20.pdns.php
@@ -0,0 +1,204 @@
+ (2016-)
+ * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package Cron
+ *
+ */
+class pdns extends DnsBase
+{
+
+ private $pdns_db = null;
+
+ public function writeConfigs()
+ {
+ // tell the world what we are doing
+ $this->_logger->logAction(CRON_ACTION, LOG_INFO, 'Task4 started - Refreshing DNS database');
+
+ // connect to db
+ $this->_connectToPdnsDb();
+
+ // clean up
+ $this->_cleanZonefiles();
+
+ $domains = $this->getDomainList();
+
+ if (! empty($domains)) {
+
+ foreach ($domains as $domain) {
+ // check for system-hostname
+ $isFroxlorHostname = false;
+ if (isset($domain['froxlorhost']) && $domain['froxlorhost'] == 1) {
+ $isFroxlorHostname = true;
+ }
+ // create zone-file
+ $this->_logger->logAction(CRON_ACTION, LOG_DEBUG, 'Generating dns zone for ' . $domain['domain']);
+ $zone = createDomainZone($domain['id'], $isFroxlorHostname);
+
+ $dom_id = $this->_insertZone($zone->origin, $zone->serial);
+ $this->_insertRecords($dom_id, $zone->records);
+ $this->_insertAllowedTransfers($dom_id);
+
+ $this->_logger->logAction(CRON_ACTION, LOG_INFO, '`' . $domain['domain'] . '` zone written');
+ }
+
+ $this->_logger->logAction(CRON_ACTION, LOG_INFO, 'Database updated');
+
+ // reload Bind
+ safe_exec(escapeshellcmd(Settings::Get('system.bindreload_command')));
+ $this->_logger->logAction(CRON_ACTION, LOG_INFO, 'pdns reloaded');
+ }
+ }
+
+ private function _cleanZonefiles()
+ {
+ $this->_logger->logAction(CRON_ACTION, LOG_INFO, 'Cleaning dns zone entries from database');
+
+ $this->pdns_db->query("TRUNCATE TABLE `records`");
+ $this->pdns_db->query("TRUNCATE TABLE `domains`");
+ $this->pdns_db->query("TRUNCATE TABLE `domainmetadata`");
+ }
+
+ private function _insertZone($domainname, $serial = 0)
+ {
+ $ins_stmt = $this->pdns_db->prepare("
+ INSERT INTO domains set `name` = :domainname, `notified_serial` = :serial, `type` = 'NATIVE'
+ ");
+ $ins_stmt->execute(array('domainname' => $domainname, 'serial' => $serial));
+ $lastid = $this->pdns_db->lastInsertId();
+ return $lastid;
+ }
+
+ private function _insertRecords($domainid = 0, $records)
+ {
+ $ins_stmt = $this->pdns_db->prepare("
+ INSERT INTO records set
+ `domain_id` = :did,
+ `name` = :rec,
+ `type` = :type,
+ `content` = :content,
+ `ttl` = :ttl,
+ `prio` = :prio,
+ `disabled` = '0'
+ ");
+
+ foreach ($records as $record)
+ {
+ $ins_data = array(
+ 'did' => $domainid,
+ 'rec' => $record->record,
+ 'type' => $record->type,
+ 'content' => $record->content,
+ 'ttl' => $record->ttl,
+ 'prio' => $record->priority
+ );
+ $ins_stmt->execute($ins_data);
+ }
+ }
+
+ private function _insertAllowedTransfers($domainid)
+ {
+ $ins_stmt = $this->pdns_db->prepare("
+ INSERT INTO domainmetadata set `domain_id` = :did, `kind` = 'ALLOW-AXFR-FROM', `content` = :value
+ ");
+
+ $ins_data = array(
+ 'did' => $domainid
+ );
+
+ if (count($this->_ns) > 0 || count($this->_axfr) > 0) {
+ // put nameservers in allow-transfer
+ if (count($this->_ns) > 0) {
+ foreach ($this->_ns as $ns) {
+ foreach ($ns["ips"] as $ip) {
+ $ins_data['value'] = $ip;
+ $ins_stmt->execute($ins_data);
+ }
+ }
+ }
+ // AXFR server #100
+ if (count($this->_axfr) > 0) {
+ foreach ($this->_axfr as $axfrserver) {
+ if (validate_ip($axfrserver, true) !== false) {
+ $ins_data['value'] = $axfrserver;
+ $ins_stmt->execute($ins_data);
+ }
+ }
+ }
+ }
+ }
+
+ private function _connectToPdnsDb()
+ {
+ // get froxlor pdns config
+ $cf = Settings::Get('system.bindconf_directory').'/pdns_froxlor.conf';
+ $config = makeCorrectFile($cf);
+
+ if (!file_exists($config))
+ {
+ $this->_logger->logAction(CRON_ACTION, LOG_ERROR, 'PowerDNS configuration file not found. Did you go through the configuration templates?');
+ die('PowerDNS configuration file not found. Did you go through the configuration templates?');
+ }
+ $lines = file($config);
+ $mysql_data = array();
+ foreach ($lines as $line)
+ {
+ $line = trim($line);
+ if (strtolower(substr($line, 0, 6)) == 'gmysql')
+ {
+ $namevalue = explode("=", $line);
+ $mysql_data[$namevalue[0]] = $namevalue[1];
+ }
+ }
+
+ // build up connection string
+ $driver = 'mysql';
+ $dsn = $driver.":";
+ $options = array(PDO::MYSQL_ATTR_INIT_COMMAND => 'set names utf8');
+ $attributes = array('ATTR_ERRMODE' => 'ERRMODE_EXCEPTION');
+ $dbconf = array();
+
+ $dbconf["dsn"] = array(
+ 'dbname' => $mysql_data["gmysql-dbname"],
+ 'charset' => 'utf8'
+ );
+
+ if (isset($mysql_data['gmysql-socket']) && !empty($mysql_data['gmysql-socket'])) {
+ $dbconf["dsn"]['unix_socket'] = makeCorrectFile($mysql_data['gmysql-socket']);
+ } else {
+ $dbconf["dsn"]['host'] = $mysql_data['gmysql-host'];
+ $dbconf["dsn"]['port'] = $mysql_data['gmysql-port'];
+ }
+
+ // add options to dsn-string
+ foreach ($dbconf["dsn"] as $k => $v) {
+ $dsn .= $k."=".$v.";";
+ }
+
+ // clean up
+ unset($dbconf);
+
+ // try to connect
+ try {
+ $this->pdns_db = new PDO($dsn, $mysql_data['gmysql-user'], $mysql_data['gmysql-password'], $options);
+ } catch (PDOException $e) {
+ die($e->getMessage());
+ }
+
+ // set attributes
+ foreach ($attributes as $k => $v) {
+ $this->pdns_db->setAttribute(constant("PDO::".$k), constant("PDO::".$v));
+ }
+ }
+}
diff --git a/scripts/jobs/cron_tasks.php b/scripts/jobs/cron_tasks.php
index 1bf460be..e69a0192 100644
--- a/scripts/jobs/cron_tasks.php
+++ b/scripts/jobs/cron_tasks.php
@@ -181,14 +181,10 @@ while ($row = $result_tasks_stmt->fetch(PDO::FETCH_ASSOC)) {
*/
elseif ($row['type'] == '4' && (int)Settings::Get('system.bind_enable') != 0) {
- $bindclass ="bind";
-
- if (Settings::Get('system.dnsenabled') == '1') {
- $bindclass = "bind2";
- }
+ $dnssrv = Settings::Get('system.dns_server');
if (!isset($nameserver)) {
- $nameserver = new $bindclass($cronlog);
+ $nameserver = new $dnssrv($cronlog);
}
if (Settings::Get('dkim.use_dkim') == '1') {