Commit c03f4d6e authored by Till Brehm's avatar Till Brehm

Merge branch 'stable-3.1' into 'stable-3.1'

Stable 3.1



See merge request !535
parents c75ab942 8a46bee9
......@@ -2340,6 +2340,12 @@ class installer_base {
//* chown the interface files to the ispconfig user and group
$command = 'chown -R ispconfig:ispconfig '.$install_dir.'/interface';
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
//* Chmod the files and directories in the acme dir with nginx installed
if($conf['nginx']['installed'] == true) {
$command = 'chmod -R 755 '.$install_dir.'/interface/acme';
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
//* chown the server files to the root user and group
$command = 'chown -R root:root '.$install_dir.'/server';
......
......@@ -89,7 +89,7 @@ $form["tabs"]['php_name'] = array (
'formtype' => 'SELECT',
'default' => '',
'datasource' => array ( 'type' => 'SQL',
'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND web_server = 1 AND {AUTHSQL} ORDER BY server_name',
'keyfield'=> 'server_id',
'valuefield'=> 'server_name'
),
......
......@@ -421,6 +421,7 @@ if($_POST['create'] == 1) {
"dnssec_wanted" => $enable_dnssec
);
$dns_soa_id = $app->db->datalogInsert('dns_soa', $insert_data, 'id');
if($dns_soa_id > 0) $app->plugin->raiseEvent('dns:wizard:on_after_insert', $dns_soa_id);
// Insert the dns_rr records
if(is_array($dns_rr) && $dns_soa_id > 0) {
......
......@@ -108,10 +108,16 @@ $form["tabs"]['dns_slave'] = array (
'ns' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
/*
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[0-9\.]{1,255}$/',
'errmsg'=> 'ns_error_regex'),
),
*/
'validators' => array ( 0 => array ( 'type' => 'ISIP',
'separator' => ',',
'errmsg'=> 'ns_error_regex'),
),
'default' => '',
'value' => '',
'width' => '30',
......
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
$wb['origin_error_regex'] = 'Zone has a invalid format.';
$wb['ns_error_regex'] = 'NS has a invalid format.';
$wb['eg_domain_tld'] = 'e.g. domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Вече има запис за тази зона.
$wb['origin_error_regex'] = 'Името на зоната е в грешен формат.';
$wb['ns_error_regex'] = 'NS е в грешен формат.';
$wb['eg_domain_tld'] = 'примерно domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 формата изглейда така: 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Já existe um registro igual para esta zona.';
$wb['origin_error_regex'] = 'Zona inválida.';
$wb['ns_error_regex'] = 'Registro NS inválido.';
$wb['eg_domain_tld'] = 'ex.: dominio.com.';
$wb['ipv4_form_txt'] = 'Formato IPv4 - ex.: 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Zona dns secundária';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Il y a déjà un enregistrement pour cette zone.';
$wb['origin_error_regex'] = 'Le format de la zone est invalide.';
$wb['ns_error_regex'] = 'Le format de l\'enregistrement NS est invalide.';
$wb['eg_domain_tld'] = 'ex. domain.tld.';
$wb['ipv4_form_txt'] = 'Format IPv4 - ex. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Zone DNS secondaire';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Pro tuto zónu již existuje záznam.';
$wb['origin_error_regex'] = 'Zóna má neplatný formát.';
$wb['ns_error_regex'] = 'NS má neplatný formát.';
$wb['eg_domain_tld'] = 'např. domena.cz';
$wb['ipv4_form_txt'] = 'IPV4 formát, např. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Sekundární DNS zóna';
?>
......@@ -13,5 +13,5 @@ $wb['origin_error_unique'] = 'Es existiert bereits ein Eintrag für diese Zone.'
$wb['origin_error_regex'] = 'Zone hat ein ungültiges Format.';
$wb['ns_error_regex'] = 'NS hat ein ungültiges Format.';
$wb['eg_domain_tld'] = 'Format: domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 Format: 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
?>
......@@ -13,5 +13,5 @@ $wb['origin_error_unique'] = 'Der findes allerede en post for denne zone.';
$wb['origin_error_regex'] = 'Zone har et ugyldigt format.';
$wb['ns_error_regex'] = 'NS har et ugyldigt format.';
$wb['eg_domain_tld'] = 'f.eks. domæne.tld.';
$wb['ipv4_form_txt'] = 'IPv4 form - f.eks. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Υπάρχει ήδη μια εγγραφή για
$wb['origin_error_regex'] = 'Η ζώνη δεν έχει έγκυρη μορφοποίηση.';
$wb['ns_error_regex'] = 'Ο NS δεν έχει έγκυρη μορφοποίηση.';
$wb['eg_domain_tld'] = 'π.χ. domain.tld.';
$wb['ipv4_form_txt'] = 'μορφή IPv4 - π.χ. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
?>
......@@ -13,5 +13,5 @@ $wb["origin_error_unique"] = 'There is already a record for this zone.';
$wb["origin_error_regex"] = 'Zone has a invalid format.';
$wb["ns_error_regex"] = 'NS has a invalid format.';
$wb['eg_domain_tld'] = 'e.g. domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
?>
......@@ -2,7 +2,7 @@
$wb['active_txt'] = 'Habilitado';
$wb['client_txt'] = 'Cliente';
$wb['eg_domain_tld'] = 'eje. dominio.tld.';
$wb['ipv4_form_txt'] = 'Formato IPv4 - eje. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['ns_error_regex'] = 'El registro NS contiene un formato inválido.';
$wb['ns_txt'] = 'NS (Dirección IP)';
$wb['origin_error_empty'] = 'Zona vacía.';
......
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
$wb['origin_error_regex'] = 'Zone has a invalid format.';
$wb['ns_error_regex'] = 'NS has a invalid format.';
$wb['eg_domain_tld'] = 'e.g. domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Il y a déjà un enregistrement pour cette zone.';
$wb['origin_error_regex'] = 'Le format de la zone est invalide.';
$wb['ns_error_regex'] = 'Le format de l’enregistrement NS est invalide.';
$wb['eg_domain_tld'] = 'ex. domain.tld.';
$wb['ipv4_form_txt'] = 'Format IPv4 - ex. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Zone DNS secondaire';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Već postoji zapis za ovu zonu.';
$wb['origin_error_regex'] = 'Zona je u pogrešnom formatu.';
$wb['ns_error_regex'] = 'NS je u pogrešnom formatu.';
$wb['eg_domain_tld'] = 'npr. domena.tld.';
$wb['ipv4_form_txt'] = 'IPv4 forma - npr. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Sekundarne DNS zone';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
$wb['origin_error_regex'] = 'Zone has a invalid format.';
$wb['ns_error_regex'] = 'NS has a invalid format.';
$wb['eg_domain_tld'] = 'e.g. domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Sudah ada record untuk zona ini.';
$wb['origin_error_regex'] = 'Zona memiliki format yang tidak valid.';
$wb['ns_error_regex'] = 'NS memiliki format yang tidak valid.';
$wb['eg_domain_tld'] = 'e.g. domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
$wb['origin_error_regex'] = 'Zone has a invalid format.';
$wb['ns_error_regex'] = 'NS has a invalid format.';
$wb['eg_domain_tld'] = 'e.g. domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
$wb['origin_error_regex'] = 'Zone has a invalid format.';
$wb['ns_error_regex'] = 'NS has a invalid format.';
$wb['eg_domain_tld'] = 'e.g. domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Er is al een record for deze zone.';
$wb['origin_error_regex'] = 'Zone heeft een ongeldig formaat.';
$wb['ns_error_regex'] = 'NS heeft een ongeldig formaat.';
$wb['eg_domain_tld'] = 'e.g. domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Jest już rekord w tej strefie.';
$wb['origin_error_regex'] = 'Strefa ma niepoprawny format.';
$wb['ns_error_regex'] = 'NS ma niepoprawny format.';
$wb['eg_domain_tld'] = 'np. domena.pl.';
$wb['ipv4_form_txt'] = 'notacja IPv4 - np. 127.0.0.1';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Zapasowa Strefa DNS';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
$wb['origin_error_regex'] = 'Zone has a invalid format.';
$wb['ns_error_regex'] = 'NS has a invalid format.';
$wb['eg_domain_tld'] = 'e.g. domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
$wb['origin_error_regex'] = 'Zone has a invalid format.';
$wb['ns_error_regex'] = 'NS has a invalid format.';
$wb['eg_domain_tld'] = 'e.g. domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Для этой зоны уже есть запи
$wb['origin_error_regex'] = 'Зона имеет неправильный формат.';
$wb['ns_error_regex'] = 'NS имеет неправильный формат.';
$wb['eg_domain_tld'] = 'Например, domain.tld.';
$wb['ipv4_form_txt'] = 'Формат IPv4 - например, 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Вторичная DNS-зона';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
$wb['origin_error_regex'] = 'Zone has a invalid format.';
$wb['ns_error_regex'] = 'NS has a invalid format.';
$wb['eg_domain_tld'] = 'e.g. domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
?>
......@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
$wb['origin_error_regex'] = 'Zone has a invalid format.';
$wb['ns_error_regex'] = 'NS has a invalid format.';
$wb['eg_domain_tld'] = 'e.g. domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
?>
......@@ -13,5 +13,5 @@ $wb['origin_error_unique'] = 'Bu bölge için zaten bir kayıt var.';
$wb['origin_error_regex'] = 'Bölge biçimi geçersiz.';
$wb['ns_error_regex'] = 'NS biçimi geçersiz.';
$wb['eg_domain_tld'] = 'Örnek: domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 biçimi - Örnek: 1.2.3.4';
$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
?>
......@@ -273,13 +273,6 @@ server {
}
</tmpl_if>
location ~ /\.well-known/acme-challenge/ {
root /usr/local/ispconfig/interface/acme/;
index index.html index.htm;
try_files $uri =404;
}
<tmpl_loop name="basic_auth_locations">
location <tmpl_var name='htpasswd_location'> { ##merge##
auth_basic "Members Only";
......
......@@ -544,7 +544,9 @@ class bind_plugin {
foreach($tmps_sec as $tmp) {
$options = " masters {".$tmp['ns'].";};\n";
// When you have more than one master, the serial number is used to determine which Master has the most current version of the zone by the
// slaves. The slaves actually ask for the SOA record from each Master when refreshing.
$options = " masters {".str_replace(',', ';', $tmp['ns']).";};\n";
if(trim($tmp['xfer']) != '') {
$options .= " allow-transfer {".str_replace(',', ';', $tmp['xfer']).";};\n";
} else {
......
Markdown is supported
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