Skip to content
GitLab
Commit adfecbfb authored by Florian Schaal's avatar Florian Schaal
Browse files

Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

parents 9c6782b8 d9fcae91
Hide whitespace changes
Inline Side-by-side
install/sql/incremental/upd_dev_collection.sql
View file @ adfecbfb
......@@ -204,12 +204,13 @@ CREATE TABLE `ftp_traffic` (
ALTER TABLE `mail_forwarding` ADD COLUMN `allow_send_as` ENUM('n','y') NOT NULL DEFAULT 'n' AFTER `active`;
UPDATE `mail_forwarding` SET `allow_send_as` = 'y' WHERE `type` = 'alias';
--- DNSSEC-Implementation by dark alex
--- TODO: Review and resolve conflicts if more has been done in that column
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`;
ALTER TABLE `dns_soa`
ADD COLUMN `dnssec_initialized` ENUM('Y','N') NOT NULL DEFAULT 'N',
ADD COLUMN `dnssec_wanted` ENUM('Y','N') NOT NULL DEFAULT 'N',
ADD COLUMN `dnssec_last_signed` BIGINT NOT NULL DEFAULT '0',
ADD COLUMN `dnssec_info` TEXT NULL;
\ No newline at end of file
ADD COLUMN `dnssec_info` TEXT NULL;
ALTER TABLE `client` ADD COLUMN `limit_ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n' AFTER `limit_ssl`;
ALTER TABLE `client_template` ADD COLUMN `limit_ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n' AFTER `limit_ssl`;
install/sql/ispconfig3.sql
View file @ adfecbfb
......@@ -211,6 +211,7 @@ CREATE TABLE `client` (
`limit_hterror` enum('n','y') NOT NULL DEFAULT 'n',
`limit_wildcard` enum('n','y') NOT NULL DEFAULT 'n',
`limit_ssl` enum('n','y') NOT NULL DEFAULT 'n',
`limit_ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n',
`limit_web_subdomain` int(11) NOT NULL DEFAULT '-1',
`limit_web_aliasdomain` int(11) NOT NULL DEFAULT '-1',
`limit_ftp_user` int(11) NOT NULL DEFAULT '-1',
......@@ -335,6 +336,7 @@ CREATE TABLE `client_template` (
`limit_hterror` enum('n','y') NOT NULL DEFAULT 'n',
`limit_wildcard` enum('n','y') NOT NULL DEFAULT 'n',
`limit_ssl` enum('n','y') NOT NULL DEFAULT 'n',
`limit_ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n',
`limit_web_subdomain` int(11) NOT NULL default '-1',
`limit_web_aliasdomain` int(11) NOT NULL default '-1',
`limit_ftp_user` int(11) NOT NULL default '-1',
......
install/tpl/apache_ispconfig.conf.master
View file @ adfecbfb
......@@ -118,6 +118,16 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
Alias /awstats-icon "/usr/share/awstats/icon"
</tmpl_if>
Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
<Directory /usr/local/ispconfig/interface/acme/.well-known/acme-challenge>
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
<tmpl_else>
Order allow,deny
Allow from all
</tmpl_if>
</Directory>
NameVirtualHost *:80
NameVirtualHost *:443
<tmpl_loop name="ip_adresses">
......
interface/acme/.well-known/acme-challenge/empty.dir 0 → 100644
View file @ adfecbfb
This empty directory is needed by ISPConfig.
interface/web/client/form/client.tform.php
View file @ adfecbfb
......@@ -1022,6 +1022,12 @@ $form["tabs"]['limits'] = array (
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'limit_ssl_letsencrypt' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'limit_web_aliasdomain' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
......@@ -1109,6 +1115,12 @@ $form["tabs"]['limits'] = array (
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
'limit_directive_snippets' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'default_dnsserver' => array (
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
......
interface/web/client/form/client_template.tform.php
View file @ adfecbfb
......@@ -522,6 +522,12 @@ $form["tabs"]['limits'] = array (
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'limit_ssl_letsencrypt' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'limit_web_aliasdomain' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
......@@ -612,6 +618,12 @@ $form["tabs"]['limits'] = array (
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
'limit_directive_snippets' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'default_dnsserver' => array (
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
......
interface/web/client/form/reseller.tform.php
View file @ adfecbfb
......@@ -1019,6 +1019,12 @@ $form["tabs"]['limits'] = array (
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'limit_ssl_letsencrypt' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'limit_web_aliasdomain' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
......@@ -1105,6 +1111,12 @@ $form["tabs"]['limits'] = array (
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
'limit_directive_snippets' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'default_dnsserver' => array (
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
......
interface/web/client/lib/lang/de_client.lng
View file @ adfecbfb
......@@ -98,6 +98,7 @@ $wb['force_suexec_txt'] = 'SuEXEC erzwungen';
$wb['limit_hterror_txt'] = 'Eigene Fehlerseiten verfügbar';
$wb['limit_wildcard_txt'] = 'Wildcard Subdomain verfügbar';
$wb['limit_ssl_txt'] = 'SSL verfügbar';
$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt verfügbar';
$wb['limit_client_error'] = 'Die maximale Anzahl an Kunden wurde erreicht.';
$wb['limit_mailaliasdomain_txt'] = 'Max. Anzahl an Domain Aliases';
$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';
$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
$wb['limit_xmpp_status_txt'] = 'Status host available';
$wb['limit_directive_snippets_txt'] = 'Webserver-Konfigurationsauswahl sichtbar';
?>
interface/web/client/lib/lang/de_client_template.lng
View file @ adfecbfb
......@@ -77,6 +77,7 @@ $wb['force_suexec_txt'] = 'SuEXEC erzwungen';
$wb['limit_hterror_txt'] = 'Eigene Fehlerseiten verfügbar';
$wb['limit_wildcard_txt'] = 'Wildcard Subdomain verfügbar';
$wb['limit_ssl_txt'] = 'SSL verfügbar';
$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt verfügbar';
$wb['template_type_txt'] = 'Vorlagen Typ';
$wb['template_name_txt'] = 'Vorlagen Name';
$wb['web_limits_txt'] = 'Web Limits';
......@@ -114,4 +115,5 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
$wb['limit_xmpp_status_txt'] = 'Status host available';
$wb['dns_servers_txt'] = 'DNS servers';
$wb['limit_directive_snippets_txt'] = 'Webserver-Konfigurationsauswahl sichtbar';
?>
interface/web/client/lib/lang/de_reseller.lng
View file @ adfecbfb
......@@ -97,6 +97,7 @@ $wb['force_suexec_txt'] = 'SuEXEC erzwungen';
$wb['limit_hterror_txt'] = 'Eigene Fehlerseiten verfügbar';
$wb['limit_wildcard_txt'] = 'Wildcard Subdomain verfügbar';
$wb['limit_ssl_txt'] = 'SSL verfügbar';
$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt verfügbar';
$wb['limit_client_error'] = 'Die maximale Anzahl an Kunden wurde erreicht.';
$wb['limit_client_error_positive_or_unlimited'] = 'Die Anzahl an Kunden muss > 0 sein';
$wb['limit_web_quota_txt'] = 'Speicherplatzbeschränkung';
......@@ -196,4 +197,5 @@ $wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
$wb['limit_xmpp_status_txt'] = 'Status host available';
$wb['limit_directive_snippets_txt'] = 'Webserver-Konfigurationsauswahl sichtbar';
?>
interface/web/client/lib/lang/en_client.lng
View file @ adfecbfb
......@@ -110,6 +110,7 @@ $wb["force_suexec_txt"] = "SuEXEC forced";
$wb["limit_hterror_txt"] = "Custom error docs available";
$wb["limit_wildcard_txt"] = "Wildcard subdomain available";
$wb["limit_ssl_txt"] = "SSL available";
$wb["limit_ssl_letsencrypt_txt"] = "Let\'s Encrypt available";
$wb["limit_client_error"] = 'The max. number of clients is reached.';
$wb["limit_web_quota_txt"] = 'Web Quota';
$wb["limit_traffic_quota_txt"] = 'Traffic Quota';
......@@ -200,4 +201,5 @@ $wb['btn_save_txt'] = "Save";
$wb['btn_cancel_txt'] = "Cancel";
$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
$wb["email_error_empty"] = "Email is empty";
$wb['limit_directive_snippets_txt'] = 'Show web server config selection';
?>
interface/web/client/lib/lang/en_client_template.lng
View file @ adfecbfb
......@@ -85,6 +85,7 @@ $wb["force_suexec_txt"] = "SuEXEC forced";
$wb["limit_hterror_txt"] = "Custom error docs available";
$wb["limit_wildcard_txt"] = "Wildcard subdomain available";
$wb["limit_ssl_txt"] = "SSL available";
$wb["limit_ssl_letsencrypt_txt"] = "Let\'s Encrypt available";
$wb["web_limits_txt"] = 'Web Limits';
$wb["email_limits_txt"] = 'Email Limits';
$wb["database_limits_txt"] = 'Database Limits';
......@@ -116,4 +117,5 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
$wb['limit_xmpp_status_txt'] = 'Status host available';
$wb["dns_servers_txt"] = 'DNS servers';
$wb['limit_directive_snippets_txt'] = 'Show web server config selection';
?>
interface/web/client/lib/lang/en_reseller.lng
View file @ adfecbfb
......@@ -108,6 +108,7 @@ $wb["force_suexec_txt"] = "SuEXEC forced";
$wb["limit_hterror_txt"] = "Custom error docs available";
$wb["limit_wildcard_txt"] = "Wildcard subdomain available";
$wb["limit_ssl_txt"] = "SSL available";
$wb["limit_ssl_letsencrypt_txt"] = "Let\'s Encrypt available";
$wb["limit_client_error"] = 'The max. number of clients is reached.';
$wb["limit_client_error_positive_or_unlimited"] = 'The number of clients must be > 0 or -1 (unlimited)';
$wb["limit_web_quota_txt"] = 'Web Quota';
......@@ -200,4 +201,6 @@ $wb['invalid_vat_id'] = 'The VAT ID is invalid.';
$wb["btn_save_txt"] = "Save";
$wb["btn_cancel_txt"] = "Cancel";
$wb["email_error_empty"] = "Email is empty";
$wb['limit_directive_snippets_txt'] = 'Show web server config selection';
?>
interface/web/client/templates/client_edit_limits.htm
View file @ adfecbfb
......@@ -136,6 +136,12 @@
{tmpl_var name='limit_ssl'}
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='limit_ssl_letsencrypt_txt'}</label>
<div class="col-sm-9">
{tmpl_var name='limit_ssl_letsencrypt'}
</div>
</div>
<div class="form-group">
<label for="limit_web_aliasdomain" class="col-sm-3 control-label">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
<div class="col-sm-9"><input type="text" name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" class="form-control" /></div></div>
......@@ -163,6 +169,12 @@
{tmpl_var name='limit_backup'}
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='limit_directive_snippets_txt'}</label>
<div class="col-sm-9">
{tmpl_var name='limit_directive_snippets'}
</div>
</div>
</div>
</div>
</div>
......
interface/web/client/templates/client_template_edit_limits.htm
View file @ adfecbfb
......@@ -88,6 +88,12 @@
{tmpl_var name='limit_ssl'}
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='limit_ssl_letsencrypt_txt'}</label>
<div class="col-sm-9">
{tmpl_var name='limit_ssl_letsencrypt'}
</div>
</div>
<div class="form-group">
<label for="limit_web_aliasdomain" class="col-sm-3 control-label">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
<div class="col-sm-9"><input type="text" name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" class="form-control" /></div></div>
......@@ -115,6 +121,12 @@
{tmpl_var name='limit_backup'}
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='limit_directive_snippets_txt'}</label>
<div class="col-sm-9">
{tmpl_var name='limit_directive_snippets'}
</div>
</div>
</div>
</div>
</div>
......
interface/web/client/templates/reseller_edit_limits.htm
View file @ adfecbfb
......@@ -139,6 +139,12 @@
{tmpl_var name='limit_ssl'}
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='limit_ssl_letsencrypt_txt'}</label>
<div class="col-sm-9">
{tmpl_var name='limit_ssl_letsencrypt'}
</div>
</div>
<div class="form-group">
<label for="limit_web_aliasdomain" class="col-sm-3 control-label">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
<div class="col-sm-9"><input type="text" name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" class="form-control" /></div></div>
......@@ -166,6 +172,12 @@
{tmpl_var name='limit_backup'}
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='limit_directive_snippets_txt'}</label>
<div class="col-sm-9">
{tmpl_var name='limit_directive_snippets'}
</div>
</div>
</div>
</div>
</div>
......
interface/web/sites/form/web_vhost_domain.tform.php
View file @ adfecbfb
......@@ -88,10 +88,11 @@ $ssl_available = true;
$backup_available = ($vhostdomain_type == 'domain');
if(!$app->auth->is_admin()) {
$client_group_id = $_SESSION["s"]["user"]["default_group"];
$client = $app->db->queryOneRecord("SELECT limit_wildcard, limit_ssl, limit_backup FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
$client = $app->db->queryOneRecord("SELECT limit_wildcard, limit_ssl, limit_ssl_letsencrypt, limit_backup FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
if($client['limit_wildcard'] != 'y') $wildcard_available = false;
if($client['limit_ssl'] != 'y') $ssl_available = false;
if($client['limit_ssl_letsencrypt'] == 'y') $ssl_available = false;
if($client['limit_backup'] != 'y') $backup_available = false;
}
......
interface/web/sites/lib/lang/de_web_vhost_domain.lng
View file @ adfecbfb
......@@ -142,4 +142,5 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
$wb['password_strength_txt'] = 'Password strength';
$wb['directive_snippets_id_txt'] = 'Webserver-Konfiguration';
?>
interface/web/sites/lib/lang/en_web_vhost_domain.lng
View file @ adfecbfb
......@@ -147,4 +147,5 @@ $wb["document_root_txt"] = "Document Root";
$wb['ssl_letsencrypt_txt'] = 'Let\'s Encrypt SSL';
$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
$wb['password_strength_txt'] = 'Password strength';
$wb['directive_snippets_id_txt'] = 'Web server config';
?>
interface/web/sites/lib/module.conf.php
View file @ adfecbfb
......@@ -194,6 +194,11 @@ $items[] = array( 'title' => 'Web traffic',
'link' => 'sites/web_sites_stats.php',
'html_id' => 'websites_stats');
$items[] = array( 'title' => 'FTP traffic',
'target' => 'content',
'link' => 'sites/ftp_sites_stats.php',
'html_id' => 'ftpsites_stats');
$items[] = array( 'title' => 'Website quota (Harddisk)',
'target' => 'content',
'link' => 'sites/user_quota_stats.php',
......
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