Commit 08791fea authored by A. Täffner's avatar A. Täffner
Browse files

Test: Merge branch 'master' into dns-dnssec

Conflicts:
	install/lib/installer_base.lib.php
parents 228e0396 ab3c7dfb
......@@ -144,7 +144,7 @@ $conf['saslauthd']['init_script'] = 'saslauthd';
//* Amavisd
$conf['amavis']['installed'] = false; // will be detected automatically during installation
$conf['amavis']['config_dir'] = '/etc';
$conf['amavis']['config_dir'] = '/etc/amavisd';
$conf['amavis']['init_script'] = 'amavisd';
//* ClamAV
......
......@@ -1502,12 +1502,12 @@ class installer_base {
//* Create the slave subdirectory
$content .= 'slave';
if(!@is_dir($content)) mkdir($content, 2770, true);
if(!@is_dir($content)) mkdir($content, 02770, true);
//* Chown the slave subdirectory to $conf['bind']['bind_user']
chown($content, $conf['bind']['bind_user']);
chgrp($content, $conf['bind']['bind_group']);
chmod($content, 2770);
chmod($content, 02770);
//* Install scripts for dnssec implementation
$this->process_bind_file('named.conf.options', '/etc/bind/', true); //TODO replace hardcoded path
......@@ -2845,4 +2845,4 @@ Email Address []:
}
?>
\ No newline at end of file
?>
......@@ -314,6 +314,7 @@ if($_POST['create'] == 1) {
$tpl_rows = explode("\n", $tpl_content);
$section = '';
$vars = array();
$vars['xfer']='';
$dns_rr = array();
foreach($tpl_rows as $row) {
$row = trim($row);
......
......@@ -115,7 +115,7 @@ $form["tabs"]['dns'] = array (
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'data_error_empty'),
1 => array ( 'type' => 'REGEX',
'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/',
'regex' => '/^[a-zA-Z0-9\.\-\_]{1,255}$/',
'errmsg'=> 'data_error_regex'),
),
'default' => '',
......
......@@ -10,4 +10,13 @@ $wb['client_txt'] = 'Πελάτης';
$wb['limit_maildomain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των email domains για τον λογαριασμό σας.';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- ανενεργό -';
$wb["dkim_txt"] = 'enable DKIM';
$wb["dkim_private_txt"] = 'DKIM Private-key';
$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
?>
......@@ -10,4 +10,13 @@ $wb['client_txt'] = 'Клиент';
$wb['limit_maildomain_txt'] = 'Максимальное число почтовых доменов, достигнуто.';
$wb['policy_txt'] = 'Спам-фильтр';
$wb['no_policy'] = '- не включено -';
$wb["dkim_txt"] = 'enable DKIM';
$wb["dkim_private_txt"] = 'DKIM Private-key';
$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
?>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment