Skip to content

Commit 8f68c0e

Browse files
qroacqroac
committed
Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
2 parents 894dbac + 4382fdc commit 8f68c0e

34 files changed

+952
-29
lines changed

‎install/dist/conf/ubuntu1804.conf.php‎

Lines changed: 230 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,230 @@
1+
<?php
2+
3+
/*
4+
Copyright (c) 2017, Till Brehm, ISPConfig UG
5+
All rights reserved.
6+
7+
Redistribution and use in source and binary forms, with or without modification,
8+
are permitted provided that the following conditions are met:
9+
10+
* Redistributions of source code must retain the above copyright notice,
11+
this list of conditions and the following disclaimer.
12+
* Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
15+
* Neither the name of ISPConfig nor the names of its contributors
16+
may be used to endorse or promote products derived from this software without
17+
specific prior written permission.
18+
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
20+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
21+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
22+
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
23+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
24+
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
26+
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
27+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
28+
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
*/
30+
31+
//*** Ubuntu 18.04 default settings
32+
33+
//* Main
34+
$conf['language'] = 'en';
35+
$conf['distname'] = 'ubuntu1804';
36+
$conf['hostname'] = 'server1.domain.tld'; // Full hostname
37+
$conf['ispconfig_install_dir'] = '/usr/local/ispconfig';
38+
$conf['ispconfig_config_dir'] = '/usr/local/ispconfig';
39+
$conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error
40+
$conf['ispconfig_log_dir'] = '/var/log/ispconfig';
41+
$conf['server_id'] = 1;
42+
$conf['init_scripts'] = '/etc/init.d';
43+
$conf['runlevel'] = '/etc';
44+
$conf['shells'] = '/etc/shells';
45+
$conf['pam'] = '/etc/pam.d';
46+
47+
//* Services provided by this server, this selection will be overridden by the expert mode
48+
$conf['services']['mail'] = true;
49+
$conf['services']['web'] = true;
50+
$conf['services']['dns'] = true;
51+
$conf['services']['file'] = true;
52+
$conf['services']['db'] = true;
53+
$conf['services']['vserver'] = true;
54+
$conf['services']['proxy'] = false;
55+
$conf['services']['firewall'] = false;
56+
57+
//* MySQL
58+
$conf['mysql']['installed'] = false; // will be detected automatically during installation
59+
$conf['mysql']['init_script'] = 'mysql';
60+
$conf['mysql']['host'] = 'localhost';
61+
$conf['mysql']['ip'] = '127.0.0.1';
62+
$conf['mysql']['port'] = '3306';
63+
$conf['mysql']['database'] = 'dbispconfig';
64+
$conf['mysql']['admin_user'] = 'root';
65+
$conf['mysql']['admin_password'] = '';
66+
$conf['mysql']['charset'] = 'utf8';
67+
$conf['mysql']['ispconfig_user'] = 'ispconfig';
68+
$conf['mysql']['ispconfig_password'] = md5(uniqid(rand()));
69+
$conf['mysql']['master_slave_setup'] = 'n';
70+
$conf['mysql']['master_host'] = '';
71+
$conf['mysql']['master_database'] = 'dbispconfig';
72+
$conf['mysql']['master_admin_user'] = 'root';
73+
$conf['mysql']['master_admin_password'] = '';
74+
$conf['mysql']['master_ispconfig_user'] = '';
75+
$conf['mysql']['master_ispconfig_password'] = md5(uniqid(rand()));
76+
77+
//* Apache
78+
$conf['apache']['installed'] = false; // will be detected automatically during installation
79+
$conf['apache']['user'] = 'www-data';
80+
$conf['apache']['group'] = 'www-data';
81+
$conf['apache']['init_script'] = 'apache2';
82+
$conf['apache']['version'] = '2.4';
83+
$conf['apache']['vhost_conf_dir'] = '/etc/apache2/sites-available';
84+
$conf['apache']['vhost_conf_enabled_dir'] = '/etc/apache2/sites-enabled';
85+
$conf['apache']['vhost_port'] = '8080';
86+
$conf['apache']['php_ini_path_apache'] = '/etc/php/7.2/apache2/php.ini';
87+
$conf['apache']['php_ini_path_cgi'] = '/etc/php/7.2/cgi/php.ini';
88+
89+
//* Website base settings
90+
$conf['web']['website_basedir'] = '/var/www';
91+
$conf['web']['website_path'] = '/var/www/clients/client[client_id]/web[website_id]';
92+
$conf['web']['website_symlinks'] = '/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/';
93+
94+
//* Apps base settings
95+
$conf['web']['apps_vhost_ip'] = '_default_';
96+
$conf['web']['apps_vhost_port'] = '8081';
97+
$conf['web']['apps_vhost_servername'] = '';
98+
$conf['web']['apps_vhost_user'] = 'ispapps';
99+
$conf['web']['apps_vhost_group'] = 'ispapps';
100+
101+
//* Fastcgi
102+
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php/7.2/cgi/';
103+
$conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/';
104+
$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi';
105+
106+
//* Postfix
107+
$conf['postfix']['installed'] = false; // will be detected automatically during installation
108+
$conf['postfix']['config_dir'] = '/etc/postfix';
109+
$conf['postfix']['init_script'] = 'postfix';
110+
$conf['postfix']['user'] = 'postfix';
111+
$conf['postfix']['group'] = 'postfix';
112+
$conf['postfix']['vmail_userid'] = '5000';
113+
$conf['postfix']['vmail_username'] = 'vmail';
114+
$conf['postfix']['vmail_groupid'] = '5000';
115+
$conf['postfix']['vmail_groupname'] = 'vmail';
116+
$conf['postfix']['vmail_mailbox_base'] = '/var/vmail';
117+
118+
//* Mailman
119+
$conf['mailman']['installed'] = false; // will be detected automatically during installation
120+
$conf['mailman']['config_dir'] = '/etc/mailman';
121+
$conf['mailman']['init_script'] = 'mailman';
122+
123+
//* Getmail
124+
$conf['getmail']['installed'] = false; // will be detected automatically during installation
125+
$conf['getmail']['config_dir'] = '/etc/getmail';
126+
$conf['getmail']['program'] = '/usr/bin/getmail';
127+
128+
//* Courier
129+
$conf['courier']['installed'] = false; // will be detected automatically during installation
130+
$conf['courier']['config_dir'] = '/etc/courier';
131+
$conf['courier']['courier-authdaemon'] = 'courier-authdaemon';
132+
$conf['courier']['courier-imap'] = 'courier-imap';
133+
$conf['courier']['courier-imap-ssl'] = 'courier-imap-ssl';
134+
$conf['courier']['courier-pop'] = 'courier-pop';
135+
$conf['courier']['courier-pop-ssl'] = 'courier-pop-ssl';
136+
137+
//* Dovecot
138+
$conf['dovecot']['installed'] = false; // will be detected automatically during installation
139+
$conf['dovecot']['config_dir'] = '/etc/dovecot';
140+
$conf['dovecot']['init_script'] = 'dovecot';
141+
142+
//* SASL
143+
$conf['saslauthd']['installed'] = false; // will be detected automatically during installation
144+
$conf['saslauthd']['config'] = '/etc/default/saslauthd';
145+
$conf['saslauthd']['init_script'] = 'saslauthd';
146+
147+
//* Amavisd
148+
$conf['amavis']['installed'] = false; // will be detected automatically during installation
149+
$conf['amavis']['config_dir'] = '/etc/amavis';
150+
$conf['amavis']['init_script'] = 'amavis';
151+
152+
//* ClamAV
153+
$conf['clamav']['installed'] = false; // will be detected automatically during installation
154+
$conf['clamav']['init_script'] = 'clamav-daemon';
155+
156+
//* Pureftpd
157+
$conf['pureftpd']['installed'] = false; // will be detected automatically during installation
158+
$conf['pureftpd']['config_dir'] = '/etc/pure-ftpd';
159+
$conf['pureftpd']['init_script'] = 'pure-ftpd-mysql';
160+
161+
//* MyDNS
162+
$conf['mydns']['installed'] = false; // will be detected automatically during installation
163+
$conf['mydns']['config_dir'] = '/etc';
164+
$conf['mydns']['init_script'] = 'mydns';
165+
166+
//* PowerDNS
167+
$conf['powerdns']['installed'] = false; // will be detected automatically during installation
168+
$conf['powerdns']['database'] = 'powerdns';
169+
$conf["powerdns"]["config_dir"] = '/etc/powerdns/pdns.d';
170+
$conf['powerdns']['init_script'] = 'pdns';
171+
172+
//* BIND DNS Server
173+
$conf['bind']['installed'] = false; // will be detected automatically during installation
174+
$conf['bind']['bind_user'] = 'root';
175+
$conf['bind']['bind_group'] = 'bind';
176+
$conf['bind']['bind_zonefiles_dir'] = '/etc/bind';
177+
$conf['bind']['named_conf_path'] = '/etc/bind/named.conf';
178+
$conf['bind']['named_conf_local_path'] = '/etc/bind/named.conf.local';
179+
$conf['bind']['init_script'] = 'bind9';
180+
181+
//* Jailkit
182+
$conf['jailkit']['installed'] = false; // will be detected automatically during installation
183+
$conf['jailkit']['config_dir'] = '/etc/jailkit';
184+
$conf['jailkit']['jk_init'] = 'jk_init.ini';
185+
$conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
186+
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico /usr/bin/mysql /usr/bin/mysqldump /usr/bin/git /usr/bin/git-receive-pack /usr/bin/git-upload-pack /usr/bin/unzip /usr/bin/zip /bin/tar /bin/rm /usr/bin/patch /etc/localtime';
187+
$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
188+
189+
//* Squid
190+
$conf['squid']['installed'] = false; // will be detected automatically during installation
191+
$conf['squid']['config_dir'] = '/etc/squid';
192+
$conf['squid']['init_script'] = 'squid';
193+
194+
//* Nginx
195+
$conf['nginx']['installed'] = false; // will be detected automatically during installation
196+
$conf['nginx']['user'] = 'www-data';
197+
$conf['nginx']['group'] = 'www-data';
198+
$conf['nginx']['config_dir'] = '/etc/nginx';
199+
$conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available';
200+
$conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled';
201+
$conf['nginx']['init_script'] = 'nginx';
202+
$conf['nginx']['vhost_port'] = '8080';
203+
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
204+
$conf['nginx']['php_fpm_init_script'] = 'php7.2-fpm';
205+
$conf['nginx']['php_fpm_ini_path'] = '/etc/php/7.2/fpm/php.ini';
206+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php/7.2/fpm/pool.d';
207+
$conf['nginx']['php_fpm_start_port'] = 9010;
208+
$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php7.2-fpm';
209+
210+
//* OpenVZ
211+
$conf['openvz']['installed'] = false;
212+
213+
//*Bastille-Firwall
214+
$conf['bastille']['installed'] = false;
215+
$conf['bastille']['config_dir'] = '/etc/Bastille';
216+
217+
//* vlogger
218+
$conf['vlogger']['config_dir'] = '/etc';
219+
220+
//* cron
221+
$conf['cron']['init_script'] = 'cron';
222+
$conf['cron']['crontab_dir'] = '/etc/cron.d';
223+
$conf['cron']['wget'] = '/usr/bin/wget';
224+
225+
//* Metronome XMPP
226+
$conf['xmpp']['installed'] = false;
227+
$conf['xmpp']['init_script'] = 'metronome';
228+
229+
230+
?>

‎interface/lib/classes/custom_datasource.inc.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ function dns_servers($field, $record) {
4747
if($_SESSION["s"]["user"]["typ"] == 'user') {
4848
// Get the limits of the client
4949
$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
50+
5051
$client = $app->db->queryOneRecord("SELECT default_dnsserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
5152
$sql = "SELECT server_id,server_name FROM server WHERE server_id = ?";
5253
} else {
@@ -167,9 +168,10 @@ function client_servers($field, $record) {
167168
$sql = "SELECT $server_type as server_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?";
168169
$client = $app->db->queryOneRecord($sql, $client_group_id);
169170
if($client['server_id'] > 0) {
170-
//* Select the default server for the client
171-
$sql = "SELECT server_id,server_name FROM server WHERE server_id = ?";
172-
$records = $app->db->queryAllRecords($sql, $client['server_id']);
171+
//* Select the available servers for the client
172+
$clientservers = $client['server_id'];
173+
$sql = "SELECT server_id,server_name FROM server WHERE server_id IN ($clientservers) ORDER BY server_name";
174+
$records = $app->db->queryAllRecords($sql);
173175
} else {
174176
//* Not able to find the clients defaults, use this as fallback and add a warning message to the log
175177
$app->log('Unable to find default server for client in custom_datasource.inc.php', 1);
@@ -182,7 +184,7 @@ function client_servers($field, $record) {
182184
$records = $app->db->queryAllRecords($sql, $field);
183185
}
184186

185-
187+
186188
$records_new = array();
187189
if(is_array($records)) {
188190
foreach($records as $rec) {
@@ -197,4 +199,4 @@ function client_servers($field, $record) {
197199

198200
}
199201

200-
?>
202+
?>

‎interface/lib/classes/remote.d/dns.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public function dns_zone_get_id($session_id, $origin)
240240
return false;
241241
}
242242

243-
if(!preg_match('/^[a-z0-9][a-z0-9\-]+[a-z0-9](\.[a-z]{2,4})+$/i', $origin)){
243+
if(!preg_match('/^([a-z0-9][a-z0-9\-]+[a-z0-9]|[a-z0-9]{2})(\.[a-z]{2,63})+$/i', $origin)){
244244
throw new SoapFault('no_domain_found', 'Invalid domain name.');
245245
return false;
246246
}

‎interface/web/dns/lib/lang/ar_dns_soa.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
3737
$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
3838
$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
3939
$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
40-
$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
40+
$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delivered in signed format afterwards.';
4141
$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
4242
$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
4343
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';

‎interface/web/dns/lib/lang/bg_dns_soa.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
3737
$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
3838
$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
3939
$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
40-
$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
40+
$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delivered in signed format afterwards.';
4141
$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
4242
$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
4343
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';

‎interface/web/dns/lib/lang/ca_dns_soa.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $wb['ttl_range_error'] = 'La TTL minimum est 60 secondes.';
3737
$wb['xfer_error_regex'] = 'A noter également : Veuillez utiliser une adresse IP.';
3838
$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
3939
$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
40-
$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
40+
$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delivered in signed format afterwards.';
4141
$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
4242
$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
4343
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';

‎interface/web/dns/lib/lang/dk_dns_soa.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $wb['minimum_range_error'] = 'Min. Minimum tid er 60 sekunder.';
3737
$wb['ttl_range_error'] = 'Min. TTL tid er 60 sekunder.';
3838
$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
3939
$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
40-
$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
40+
$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delivered in signed format afterwards.';
4141
$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
4242
$wb['soa_cannot_be_changed_txt'] = 'The Zone (SOA) can not be changed. Please contact your administrator to change the zone.';
4343
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';

‎interface/web/dns/lib/lang/el_dns_soa.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
3737
$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
3838
$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
3939
$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
40-
$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
40+
$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delivered in signed format afterwards.';
4141
$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
4242
$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
4343
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';

‎interface/web/dns/lib/lang/en_dns_soa.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ $wb["xfer_txt"] = 'Allow zone transfers to <br />these IPs (comma separated list
1313
$wb["active_txt"] = 'Active';
1414
$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
1515
$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
16-
$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
16+
$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delivered in signed format afterwards.';
1717
$wb["limit_dns_zone_txt"] = 'The max. number of DNS zones for your account is reached.';
1818
$wb["client_txt"] = 'Client';
1919
$wb["no_zone_perm"] = 'You do not have the permission to add a record to this DNS zone.';

‎interface/web/dns/lib/lang/fi_dns_soa.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
3737
$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
3838
$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
3939
$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
40-
$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
40+
$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delivered in signed format afterwards.';
4141
$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
4242
$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
4343
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';

0 commit comments

Comments
 (0)