Commit 593d9826 authored by Thom's avatar Thom 🛠
Browse files

Remove SPDY/HTTP2 optional function(#5646)

parent 0ecbb352
......@@ -35,3 +35,6 @@ ALTER TABLE `mail_user` ADD `disableindexer-worker` ENUM('n','y') CHARACTER SET
-- add SSHFP and DNAME record
ALTER TABLE `dns_rr` CHANGE `type` `type` ENUM('A','AAAA','ALIAS','CNAME','DNAME','CAA','DS','HINFO','LOC','MX','NAPTR','NS','PTR','RP','SRV','SSHFP','TXT','TLSA','DNSKEY') NULL DEFAULT NULL AFTER `name`;
-- remove SPDY option
ALTER TABLE `web_domain` DROP COLUMN `enable_spdy`;
......@@ -2070,7 +2070,6 @@ CREATE TABLE `web_domain` (
`traffic_quota_lock` enum('n','y') NOT NULL default 'n',
`fastcgi_php_version` varchar(255) DEFAULT NULL,
`proxy_directives` mediumtext,
`enable_spdy` ENUM('y','n') NULL DEFAULT 'n',
`last_quota_notification` date NULL default NULL,
`rewrite_rules` mediumtext,
`added_date` date NULL DEFAULT NULL,
......
......@@ -10,15 +10,15 @@
<VirtualHost {tmpl_var name='apps_vhost_ip'}:{tmpl_var name='apps_vhost_port'}>
ServerAdmin webmaster@localhost
{tmpl_var name='apps_vhost_servername'}
<FilesMatch "\.ph(p3?|tml)$">
SetHandler None
</FilesMatch>
<IfModule mod_headers.c>
RequestHeader unset Proxy early
</IfModule>
{tmpl_if name="enable_spdy" op="==" value="y"}
<IfModule spdy_module>
SpdyEnabled on
......@@ -39,7 +39,7 @@
</tmpl_if>
</Directory>
</IfModule>
<IfModule mod_php7.c>
DocumentRoot {tmpl_var name='apps_vhost_dir'}
AddType application/x-httpd-php .php
......@@ -54,7 +54,7 @@
</tmpl_if>
</Directory>
</IfModule>
<IfModule mod_fcgid.c>
DocumentRoot {tmpl_var name='apps_vhost_dir'}
SuexecUserGroup ispapps ispapps
......@@ -87,5 +87,3 @@
</VirtualHost>
......@@ -94,7 +94,6 @@ php_ini_path_apache=/etc/php5/apache2/php.ini
php_ini_path_cgi=/etc/php5/cgi/php.ini
check_apache_config=y
enable_sni=y
enable_spdy=n
skip_le_check=n
enable_ip_wildcard=y
overtraffic_notify_admin=y
......
......@@ -1317,15 +1317,6 @@ $form["tabs"]['web'] = array(
'width' => '40',
'maxlength' => '255'
),
'enable_spdy' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'y',
'value' => array (
0 => 'n',
1 => 'y'
)
),
'apps_vhost_enabled' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
......
......@@ -163,7 +163,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='overquota_db_notify_client_txt'}</label>
<div class="col-sm-9">
{tmpl_var name='overquota_db_notify_client'}
{tmpl_var name='overquota_db_notify_client'}
</div>
</div>
<div class="form-group">
......@@ -197,14 +197,6 @@
{tmpl_var name='enable_sni'}
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">
<tmpl_var name="enable_spdy_txt">
</label>
<div class="col-sm-9">
<tmpl_var name="enable_spdy">
</div>
</div>
<div class="form-group">
<label for="CA_path" class="col-sm-3 control-label">{tmpl_var name='CA_path_txt'}</label>
<div class="col-sm-9"><input type="text" name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" autocomplete="new-password" class="form-control" /></div></div>
......@@ -257,7 +249,7 @@
<div class="form-group">
<label for="connect_userid_to_webid_start" class="col-sm-3 control-label">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
<div class="col-sm-9"><input type="text" name="connect_userid_to_webid_start" id="connect_userid_to_webid_start" value="{tmpl_var name='connect_userid_to_webid_start'}" class="form-control" /></div></div>
<!-- End content -->
</div>
</div>
......@@ -361,7 +353,7 @@
<div class="form-group">
<label for="apps_vhost_servername" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_servername_txt'}</label>
<div class="col-sm-9"><input type="text" name="apps_vhost_servername" id="apps_vhost_servername" value="{tmpl_var name='apps_vhost_servername'}" class="form-control" /></div></div>
<!-- End content -->
</div>
</div>
......@@ -389,15 +381,15 @@
<div class="form-group">
<label for="awstats_buildstaticpages_pl" class="col-sm-3 control-label">{tmpl_var name='awstats_buildstaticpages_pl_txt'}</label>
<div class="col-sm-9"><input type="text" name="awstats_buildstaticpages_pl" id="awstats_buildstaticpages_pl" value="{tmpl_var name='awstats_buildstaticpages_pl'}" class="form-control" /></div></div>
<!-- End content -->
</div>
</div>
</div>
</div>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
......@@ -410,7 +402,7 @@
serverType = $(this).val();
adjustForm();
});
function adjustForm(){
if(serverType == "nginx"){
jQuery('.nginx').show();
......
......@@ -591,15 +591,6 @@ if($ssl_available) {
'default' => '',
'value' => array('' => 'none_txt', 'save' => 'save_certificate_txt', 'create' => 'create_certificate_txt', 'del' => 'delete_certificate_txt')
),
'enable_spdy' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
'value' => array (
0 => 'n',
1 => 'y'
)
),
//#################################
// END Datatable fields
//#################################
......
......@@ -62,15 +62,7 @@
{tmpl_var name='ssl_action'}
</select></div>
</div>
{tmpl_if name="is_spdy_enabled"}
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='enable_spdy_txt'}</label>
<div class="col-sm-9">
{tmpl_var name="enable_spdy"}
</div>
</div>
{/tmpl_if}
<input type="hidden" name="id" value="{tmpl_var name='id'}">
......@@ -91,11 +83,11 @@
$('#load_data').click(function(){
loadClientData();
});
function loadClientData() {
var web_id = $("input[name=id]").val();
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {'web_id': web_id, 'type': "getclientssldata"}, function(data) {
$('#ssl_organisation').val(data['company_name']);
$('#ssl_locality').val(data['city']);
......
......@@ -840,7 +840,6 @@ class page_action extends tform_actions {
$app->tpl->setVar('vhostdomain_type', $this->_vhostdomain_type, true);
$app->tpl->setVar('is_spdy_enabled', ($web_config['enable_spdy'] === 'y'));
$app->tpl->setVar('is_pagespeed_enabled', ($web_config['nginx_enable_pagespeed'] === 'y'));
$app->tpl->setVar("is_admin", $is_admin);
......@@ -950,10 +949,8 @@ class page_action extends tform_actions {
}
$app->tpl->setLoop('folder_directive_snippets', $folder_directive_snippets);
if(is_array($web_config[$server_id])) {
$app->tpl->setVar('is_spdy_enabled', ($web_config[$server_id]['enable_spdy'] === 'y'));
$app->tpl->setVar('is_pagespeed_enabled', ($web_config[$server_id]['nginx_enable_pagespeed']));
} else {
$app->tpl->setVar('is_spdy_enabled', ($web_config['enable_spdy'] === 'y'));
$app->tpl->setVar('is_pagespeed_enabled', ($web_config['nginx_enable_pagespeed']));
}
......@@ -1325,10 +1322,6 @@ class page_action extends tform_actions {
$app->tform->errorMessage .= $app->tform->lng("invalid_custom_php_ini_settings_txt").'<br>';
}
}
if($web_config['enable_spdy'] === 'n') {
unset($app->tform->formDef["tabs"]['ssl']['fields']['enable_spdy']);
}
// if($this->dataRecord["directive_snippets_id"] < 1) $this->dataRecord["enable_pagespeed"] = 'n';
//print_r($_POST['folder_directive_snippets']);
......
......@@ -14,17 +14,11 @@
<FilesMatch "\.ph(p3?|tml)$">
SetHandler None
</FilesMatch>
<IfModule mod_headers.c>
RequestHeader unset Proxy early
</IfModule>
{tmpl_if name="enable_spdy" op="==" value="y"}
<IfModule spdy_module>
SpdyEnabled on
</IfModule>
{/tmpl_if}
<IfModule mod_php5.c>
DocumentRoot {tmpl_var name='apps_vhost_dir'}
AddType application/x-httpd-php .php
......@@ -39,7 +33,7 @@
</tmpl_if>
</Directory>
</IfModule>
<IfModule mod_php7.c>
DocumentRoot {tmpl_var name='apps_vhost_dir'}
AddType application/x-httpd-php .php
......@@ -54,7 +48,7 @@
</tmpl_if>
</Directory>
</IfModule>
<IfModule mod_fcgid.c>
DocumentRoot {tmpl_var name='apps_vhost_dir'}
SuexecUserGroup ispapps ispapps
......@@ -85,5 +79,3 @@
{/tmpl_if}
</VirtualHost>
......@@ -30,11 +30,11 @@ server {
ssl_certificate <tmpl_var name='ssl_crt_file'>;
ssl_certificate_key <tmpl_var name='ssl_key_file'>;
</tmpl_if>
server_name <tmpl_var name='domain'> <tmpl_var name='alias'>;
root <tmpl_var name='web_document_root_www'>;
<tmpl_if name='ssl_enabled'>
<tmpl_if name='rewrite_to_https' op='==' value='y'>
if ($scheme != "https") {
......@@ -72,16 +72,16 @@ server {
}
</tmpl_if>
</tmpl_loop>
<tmpl_if name='use_proxy' op='!=' value='y'>
<tmpl_if name='use_proxy' op='!=' value='y'>
index index.html index.htm index.php index.cgi index.pl index.xhtml;
<tmpl_if name='ssi' op='==' value='y'>
<tmpl_if name='ssi' op='==' value='y'>
location ~ \.shtml$ {
ssi on;
}
</tmpl_if>
<tmpl_if name='errordocs'>
<tmpl_if name='errordocs'>
error_page 400 /error/400.html;
error_page 401 /error/401.html;
error_page 403 /error/403.html;
......@@ -124,7 +124,7 @@ server {
internal;
}
</tmpl_if>
<tmpl_if name='logging' op='==' value='yes'>
error_log /var/log/ispconfig/httpd/<tmpl_var name='domain'>/error.log;
access_log /var/log/ispconfig/httpd/<tmpl_var name='domain'>/access.log combined;
......@@ -149,7 +149,7 @@ server {
index index.html;
try_files $uri $uri/ =404;
}
location = /favicon.ico {
log_not_found off;
access_log off;
......@@ -162,7 +162,7 @@ server {
log_not_found off;
access_log off;
}
location /stats/ {
<tmpl_var name='web_document_root_www_proxy'>
index index.html index.php;
......@@ -325,13 +325,13 @@ server {
location <tmpl_var name='htpasswd_location'> { ##merge##
auth_basic "Members Only";
auth_basic_user_file <tmpl_var name='htpasswd_path'>.htpasswd;
location ~ \.php$ {
try_files <tmpl_var name='rnd_php_dummy_file'> @php;
}
}
</tmpl_loop>
</tmpl_if>
</tmpl_if>
}
<tmpl_loop name="redirects">
......@@ -340,7 +340,7 @@ server {
<tmpl_if name='ipv6_enabled'>
listen [<tmpl_var name='ipv6_address'>]:80;
</tmpl_if>
<tmpl_if name='ssl_enabled'>
listen <tmpl_var name='ip_address'>:443 ssl;
<tmpl_if name='ipv6_enabled'>
......@@ -349,7 +349,7 @@ server {
ssl_certificate <tmpl_var name='ssl_crt_file'>;
ssl_certificate_key <tmpl_var name='ssl_key_file'>;
</tmpl_if>
server_name <tmpl_var name='rewrite_domain'>;
<tmpl_if name='alias_seo_redirects2'>
......
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