Skip to content

Commit adfecbf

Browse files
author
Florian Schaal
committed
2 parents 9c6782b + d9fcae9 commit adfecbf

29 files changed

+204
-49
lines changed

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,13 @@ CREATE TABLE `ftp_traffic` (
204204
ALTER TABLE `mail_forwarding` ADD COLUMN `allow_send_as` ENUM('n','y') NOT NULL DEFAULT 'n' AFTER `active`;
205205
UPDATE `mail_forwarding` SET `allow_send_as` = 'y' WHERE `type` = 'alias';
206206

207-
--- DNSSEC-Implementation by dark alex
208-
--- TODO: Review and resolve conflicts if more has been done in that column
209207
ALTER TABLE `dns_rr` CHANGE COLUMN `type` `type` ENUM('A','AAAA','ALIAS','CNAME','DS','HINFO','LOC','MX','NAPTR','NS','PTR','RP','SRV','TXT','TLSA','DNSKEY') NULL DEFAULT NULL AFTER `name`;
210208

211209
ALTER TABLE `dns_soa`
212210
ADD COLUMN `dnssec_initialized` ENUM('Y','N') NOT NULL DEFAULT 'N',
213211
ADD COLUMN `dnssec_wanted` ENUM('Y','N') NOT NULL DEFAULT 'N',
214212
ADD COLUMN `dnssec_last_signed` BIGINT NOT NULL DEFAULT '0',
215-
ADD COLUMN `dnssec_info` TEXT NULL;
213+
ADD COLUMN `dnssec_info` TEXT NULL;
214+
215+
ALTER TABLE `client` ADD COLUMN `limit_ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n' AFTER `limit_ssl`;
216+
ALTER TABLE `client_template` ADD COLUMN `limit_ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n' AFTER `limit_ssl`;

‎install/sql/ispconfig3.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ CREATE TABLE `client` (
211211
`limit_hterror` enum('n','y') NOT NULL DEFAULT 'n',
212212
`limit_wildcard` enum('n','y') NOT NULL DEFAULT 'n',
213213
`limit_ssl` enum('n','y') NOT NULL DEFAULT 'n',
214+
`limit_ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n',
214215
`limit_web_subdomain` int(11) NOT NULL DEFAULT '-1',
215216
`limit_web_aliasdomain` int(11) NOT NULL DEFAULT '-1',
216217
`limit_ftp_user` int(11) NOT NULL DEFAULT '-1',
@@ -335,6 +336,7 @@ CREATE TABLE `client_template` (
335336
`limit_hterror` enum('n','y') NOT NULL DEFAULT 'n',
336337
`limit_wildcard` enum('n','y') NOT NULL DEFAULT 'n',
337338
`limit_ssl` enum('n','y') NOT NULL DEFAULT 'n',
339+
`limit_ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n',
338340
`limit_web_subdomain` int(11) NOT NULL default '-1',
339341
`limit_web_aliasdomain` int(11) NOT NULL default '-1',
340342
`limit_ftp_user` int(11) NOT NULL default '-1',

‎install/tpl/apache_ispconfig.conf.master‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,16 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
118118
Alias /awstats-icon "/usr/share/awstats/icon"
119119
</tmpl_if>
120120

121+
Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
122+
<Directory /usr/local/ispconfig/interface/acme/.well-known/acme-challenge>
123+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
124+
Require all granted
125+
<tmpl_else>
126+
Order allow,deny
127+
Allow from all
128+
</tmpl_if>
129+
</Directory>
130+
121131
NameVirtualHost *:80
122132
NameVirtualHost *:443
123133
<tmpl_loop name="ip_adresses">

‎interface/acme/.well-known/acme-challenge/empty.dir‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This empty directory is needed by ISPConfig.

‎interface/web/client/form/client.tform.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,6 +1022,12 @@
10221022
'default' => 'n',
10231023
'value' => array(0 => 'n', 1 => 'y')
10241024
),
1025+
'limit_ssl_letsencrypt' => array (
1026+
'datatype' => 'VARCHAR',
1027+
'formtype' => 'CHECKBOX',
1028+
'default' => 'n',
1029+
'value' => array(0 => 'n', 1 => 'y')
1030+
),
10251031
'limit_web_aliasdomain' => array (
10261032
'datatype' => 'INTEGER',
10271033
'formtype' => 'TEXT',
@@ -1109,6 +1115,12 @@
11091115
'default' => 'y',
11101116
'value' => array(0 => 'n', 1 => 'y')
11111117
),
1118+
'limit_directive_snippets' => array (
1119+
'datatype' => 'VARCHAR',
1120+
'formtype' => 'CHECKBOX',
1121+
'default' => 'n',
1122+
'value' => array(0 => 'n', 1 => 'y')
1123+
),
11121124
'default_dnsserver' => array (
11131125
'datatype' => 'INTEGER',
11141126
'formtype' => 'SELECT',

‎interface/web/client/form/client_template.tform.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,12 @@
522522
'default' => 'n',
523523
'value' => array(0 => 'n', 1 => 'y')
524524
),
525+
'limit_ssl_letsencrypt' => array (
526+
'datatype' => 'VARCHAR',
527+
'formtype' => 'CHECKBOX',
528+
'default' => 'n',
529+
'value' => array(0 => 'n', 1 => 'y')
530+
),
525531
'limit_web_aliasdomain' => array (
526532
'datatype' => 'INTEGER',
527533
'formtype' => 'TEXT',
@@ -612,6 +618,12 @@
612618
'default' => 'y',
613619
'value' => array(0 => 'n', 1 => 'y')
614620
),
621+
'limit_directive_snippets' => array (
622+
'datatype' => 'VARCHAR',
623+
'formtype' => 'CHECKBOX',
624+
'default' => 'n',
625+
'value' => array(0 => 'n', 1 => 'y')
626+
),
615627
'default_dnsserver' => array (
616628
'datatype' => 'INTEGER',
617629
'formtype' => 'SELECT',

‎interface/web/client/form/reseller.tform.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,6 +1019,12 @@
10191019
'default' => 'n',
10201020
'value' => array(0 => 'n', 1 => 'y')
10211021
),
1022+
'limit_ssl_letsencrypt' => array (
1023+
'datatype' => 'VARCHAR',
1024+
'formtype' => 'CHECKBOX',
1025+
'default' => 'n',
1026+
'value' => array(0 => 'n', 1 => 'y')
1027+
),
10221028
'limit_web_aliasdomain' => array (
10231029
'datatype' => 'INTEGER',
10241030
'formtype' => 'TEXT',
@@ -1105,6 +1111,12 @@
11051111
'default' => 'y',
11061112
'value' => array(0 => 'n', 1 => 'y')
11071113
),
1114+
'limit_directive_snippets' => array (
1115+
'datatype' => 'VARCHAR',
1116+
'formtype' => 'CHECKBOX',
1117+
'default' => 'n',
1118+
'value' => array(0 => 'n', 1 => 'y')
1119+
),
11081120
'default_dnsserver' => array (
11091121
'datatype' => 'INTEGER',
11101122
'formtype' => 'SELECT',

‎interface/web/client/lib/lang/de_client.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ $wb['force_suexec_txt'] = 'SuEXEC erzwungen';
9898
$wb['limit_hterror_txt'] = 'Eigene Fehlerseiten verfügbar';
9999
$wb['limit_wildcard_txt'] = 'Wildcard Subdomain verfügbar';
100100
$wb['limit_ssl_txt'] = 'SSL verfügbar';
101+
$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt verfügbar';
101102
$wb['limit_client_error'] = 'Die maximale Anzahl an Kunden wurde erreicht.';
102103
$wb['limit_mailaliasdomain_txt'] = 'Max. Anzahl an Domain Aliases';
103104
$wb['limit_mailaliasdomain_error_notint'] = 'Das E-Mail Domain Alias Limit muss eine Zahl sein.';
@@ -194,4 +195,5 @@ $wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
194195
$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
195196
$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
196197
$wb['limit_xmpp_status_txt'] = 'Status host available';
198+
$wb['limit_directive_snippets_txt'] = 'Webserver-Konfigurationsauswahl sichtbar';
197199
?>

‎interface/web/client/lib/lang/de_client_template.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ $wb['force_suexec_txt'] = 'SuEXEC erzwungen';
7777
$wb['limit_hterror_txt'] = 'Eigene Fehlerseiten verfügbar';
7878
$wb['limit_wildcard_txt'] = 'Wildcard Subdomain verfügbar';
7979
$wb['limit_ssl_txt'] = 'SSL verfügbar';
80+
$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt verfügbar';
8081
$wb['template_type_txt'] = 'Vorlagen Typ';
8182
$wb['template_name_txt'] = 'Vorlagen Name';
8283
$wb['web_limits_txt'] = 'Web Limits';
@@ -114,4 +115,5 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
114115
$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
115116
$wb['limit_xmpp_status_txt'] = 'Status host available';
116117
$wb['dns_servers_txt'] = 'DNS servers';
118+
$wb['limit_directive_snippets_txt'] = 'Webserver-Konfigurationsauswahl sichtbar';
117119
?>

‎interface/web/client/lib/lang/de_reseller.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ $wb['force_suexec_txt'] = 'SuEXEC erzwungen';
9797
$wb['limit_hterror_txt'] = 'Eigene Fehlerseiten verfügbar';
9898
$wb['limit_wildcard_txt'] = 'Wildcard Subdomain verfügbar';
9999
$wb['limit_ssl_txt'] = 'SSL verfügbar';
100+
$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt verfügbar';
100101
$wb['limit_client_error'] = 'Die maximale Anzahl an Kunden wurde erreicht.';
101102
$wb['limit_client_error_positive_or_unlimited'] = 'Die Anzahl an Kunden muss > 0 sein';
102103
$wb['limit_web_quota_txt'] = 'Speicherplatzbeschränkung';
@@ -196,4 +197,5 @@ $wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
196197
$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
197198
$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
198199
$wb['limit_xmpp_status_txt'] = 'Status host available';
200+
$wb['limit_directive_snippets_txt'] = 'Webserver-Konfigurationsauswahl sichtbar';
199201
?>

0 commit comments

Comments
 (0)