diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 6d697786477662e18835dd00c1166dd954d331f5..4ee8da8eede5572b0f2d26fb895142c3d032e54e 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -814,6 +814,12 @@ $form["tabs"]['web'] = array( 'width' => '40', 'maxlength' => '255' ), + 'nginx_enable_pagespeed' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(0 => 'n',1 => 'y') + ), 'nginx_vhost_conf_dir' => array( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng index fefb3de909e5f2d81d835c37f5af458d30e0e037..50aed763706aa10d4f5cd1dab80b1389d4f1249c 100644 --- a/interface/web/admin/lib/lang/ar_server_config.lng +++ b/interface/web/admin/lib/lang/ar_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng index 6289f53ce3c7d06393c349d7faafb5599374bbb3..88a857ac1b6aedeaefe2c82212dd65caf0cd598b 100644 --- a/interface/web/admin/lib/lang/bg_server_config.lng +++ b/interface/web/admin/lib/lang/bg_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng index 19f8c658a227d2d59612ec5a656cb9e377b82b19..3b5df56254f3857e347960751bfdc34f6648f431 100644 --- a/interface/web/admin/lib/lang/br_server_config.lng +++ b/interface/web/admin/lib/lang/br_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Hora do backup'; $wb['skip_le_check_txt'] = 'Ignorar verificação do Lets Encrypt'; $wb['migration_mode_txt'] = 'Habilitar modo de migração do servidor'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/ca_server_config.lng b/interface/web/admin/lib/lang/ca_server_config.lng index 6688a854e513a49b2d72407662192633a324c9f8..62f10a16e40cd04fef4e8f7421a9b0d94bfacb32 100644 --- a/interface/web/admin/lib/lang/ca_server_config.lng +++ b/interface/web/admin/lib/lang/ca_server_config.lng @@ -283,4 +283,5 @@ $wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index dff15a802fd8c1222ca91f4a64b4fecdcd52bc55..8fe8d3169ed01990d2fddba3a2fa9a4811f5f164 100644 --- a/interface/web/admin/lib/lang/cz_server_config.lng +++ b/interface/web/admin/lib/lang/cz_server_config.lng @@ -283,4 +283,5 @@ $wb['hostname_error_regex'] = 'Neplatný název hostitele.'; $wb['backup_time_txt'] = 'Spustit zálohovaní v'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index 713e77e2c83f309775f62b165f866fb7652ee63f..1773440d7ed503c8719e38971d8a732c03d661b2 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -286,4 +286,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin'; $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/dk_server_config.lng b/interface/web/admin/lib/lang/dk_server_config.lng index ff072d42726d99ea57bdc8b1ffc300ace56422b9..2d0c679ea5c711a41d5da8a80c311316212e68be 100644 --- a/interface/web/admin/lib/lang/dk_server_config.lng +++ b/interface/web/admin/lib/lang/dk_server_config.lng @@ -283,4 +283,5 @@ $wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN'; $wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index 8351a32473a888a4fa9f704946a7375c6dbd5b2b..fe0c435b77d8e0be71952dc724a85ed05f7e0a60 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index 19a021fc76f3dfbfc0bf63f382236a3762bc6ccc..1783293e60a1b07fce4c105bf210019a69b020c1 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -287,4 +287,5 @@ $wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; $wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled"; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng index 2cec8f31ce78c32a3ddf2a859a712d431c80fd60..df748a1fa96de77d688e8438a4d8e897468bbfa1 100755 --- a/interface/web/admin/lib/lang/es_server_config.lng +++ b/interface/web/admin/lib/lang/es_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_use_ipv6_txt'] = 'Usar IPv6'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng index 965198cf70f9ada5b48729329ca1da1e128175da..729007915c923a762f160ba963dfed7ee9a33a8e 100755 --- a/interface/web/admin/lib/lang/fi_server_config.lng +++ b/interface/web/admin/lib/lang/fi_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng index bb7e60942cf8fa7c86584d4725ac50a4cc24f266..8d744dea5f5c31a9583571a5c922cc7521c748d2 100644 --- a/interface/web/admin/lib/lang/fr_server_config.lng +++ b/interface/web/admin/lib/lang/fr_server_config.lng @@ -283,4 +283,5 @@ $wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng index 3a639131029e3e444b412c6af67fa8ce0fa57e91..abdbd9e7300c53b60184afa2db3a9854591c6298 100644 --- a/interface/web/admin/lib/lang/hr_server_config.lng +++ b/interface/web/admin/lib/lang/hr_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng index a0549919e438b96bfe711aa23a9b3b0169cb4467..8262e80ff15356c1b4839dfe616306a030e8963d 100644 --- a/interface/web/admin/lib/lang/hu_server_config.lng +++ b/interface/web/admin/lib/lang/hu_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng index 3f232ac2bff398834dd6e51912d17f35f1b2d170..6505a49232d9e69181298915c7952736ea6610d4 100644 --- a/interface/web/admin/lib/lang/id_server_config.lng +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng index 6b16d79f50d17374ed389ef02096a35a615ff296..f6b537ccf32bc261089ebaab2993d0ddefee566e 100644 --- a/interface/web/admin/lib/lang/it_server_config.lng +++ b/interface/web/admin/lib/lang/it_server_config.lng @@ -283,4 +283,5 @@ $wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng index a59dfd1043b576d15ab4fbceaf815abac16472d3..c10fb4f89179a9d1b3df69c0d41c473b4d8d08ab 100644 --- a/interface/web/admin/lib/lang/ja_server_config.lng +++ b/interface/web/admin/lib/lang/ja_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index c8536d41055e90a77e62cfa30d31e9126c46ac99..ff7300d450876a0b8efc4fcc6e959fec31c1cda1 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index 458b05469dfe8634c482e63d4dd7d5c700994a3e..dfb56ea2ec6be234fbbd1eed81fc989fd01cf243 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng index 39bdd96c4cddc2daf41e838f30c1e867496a7505..776641f356098f8f7d0b39481ecf6aa8fdf3ebe0 100644 --- a/interface/web/admin/lib/lang/pt_server_config.lng +++ b/interface/web/admin/lib/lang/pt_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng index 800e9dcf0fb4e4eb7b9d81d79c0fd845ec4788ad..f7f660e5f609db9d08be1a58a724147e589ec6f3 100644 --- a/interface/web/admin/lib/lang/ro_server_config.lng +++ b/interface/web/admin/lib/lang/ro_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng index dddf0c06a409b8fa06babc591558850be89c399e..876273bec543e6315226547c13b1f83cc9546fd0 100644 --- a/interface/web/admin/lib/lang/ru_server_config.lng +++ b/interface/web/admin/lib/lang/ru_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Время копирования'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng index 7d3c276950731c112b87b4c67a0297d3748ac9de..9c1d1415848d3ce31b37e9279de1194e491b298c 100644 --- a/interface/web/admin/lib/lang/se_server_config.lng +++ b/interface/web/admin/lib/lang/se_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng index 710900e7857506341ae2e1f3eb1558100df5f4d7..1a235177d556ae2642ec8961a049540a05243d3f 100644 --- a/interface/web/admin/lib/lang/sk_server_config.lng +++ b/interface/web/admin/lib/lang/sk_server_config.lng @@ -283,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng index c6413445ae3f8fb6820646934ff36ab0eab482a5..f917bf5ad1c499aa15e69fc6af5f0c9e36464458 100644 --- a/interface/web/admin/lib/lang/tr_server_config.lng +++ b/interface/web/admin/lib/lang/tr_server_config.lng @@ -283,4 +283,5 @@ $wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN'; $wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; ?> diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm index 4d5113efe828398ed9fdc4ea21a1554e78ac4a06..ed58a558da02e7094855f95ccc8360862446c14d 100644 --- a/interface/web/admin/templates/server_config_web_edit.htm +++ b/interface/web/admin/templates/server_config_web_edit.htm @@ -60,6 +60,9 @@
+
+ +
{tmpl_var name='nginx_enable_pagespeed'}
diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm index 22a1952704229b8e6321b6d8a3f477f08a64d816..86fd3b294f8f01120a7f20950394ad27b875607a 100644 --- a/interface/web/sites/templates/web_vhost_domain_edit.htm +++ b/interface/web/sites/templates/web_vhost_domain_edit.htm @@ -237,6 +237,13 @@ {tmpl_var name='directive_snippets_id'} + +
+ +
{tmpl_var name="enable_pagespeed"}
+
+ + {tmpl_hook name="field_active"}
@@ -319,7 +327,8 @@ }); // new Vhostsubdomains/Vhostaliasdomains if(serverId == '') jQuery('#parent_domain_id').trigger('change'); - + +/* if(jQuery('#directive_snippets_id').val() > 0){ jQuery('.pagespeed').show(); } else { @@ -332,6 +341,7 @@ jQuery('.pagespeed').hide(); } }); +*/ function reloadServerId(noFormChange) { var parentWebId = jQuery('#parent_domain_id').val(); @@ -349,6 +359,7 @@ var selected = jQuery('#php').val(); jQuery('.apache').hide(); jQuery('.nginx').show(); +/* if(jQuery('#directive_snippets_id').val() > 0){ jQuery('.pagespeed').show(); } else { @@ -361,6 +372,7 @@ jQuery('.pagespeed').hide(); } }); +*/ if(selected != "no" && selected != "php-fpm" && selected != "hhvm") { jQuery('#php option[value="php-fpm"]').attr('selected', 'selected').val('php-fpm'); } diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php index 52771819c34c2f275e1ce69b689bcf1bd8a4aeb4..3c9fcc1306ee04e76a0e25f8ca7ba4cba419787f 100644 --- a/interface/web/sites/web_vhost_domain_edit.php +++ b/interface/web/sites/web_vhost_domain_edit.php @@ -836,6 +836,7 @@ 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); if($this->id > 0) { @@ -1308,7 +1309,7 @@ class page_action extends tform_actions { 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'; + // if($this->dataRecord["directive_snippets_id"] < 1) $this->dataRecord["enable_pagespeed"] = 'n'; //print_r($_POST['folder_directive_snippets']); //print_r($_POST['folder_directive_snippets_id']); diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index 1b1ba9793b2da23d09974c2ed51318fad49555c3..ece90a946304189068cd92976cbe44db83d3abd9 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -1149,6 +1149,16 @@ class nginx_plugin { // Custom nginx directives $final_nginx_directives = array(); + if($data['new']['enable_pagespeed'] == 'y'){ + // if PageSpeed is already enabled, don't add configuration again + if(stripos($nginx_directives, 'pagespeed') !== false){ + $vhost_data['enable_pagespeed'] = false; + } else { + $vhost_data['enable_pagespeed'] = true; + } + } else { + $vhost_data['enable_pagespeed'] = false; + } if(intval($data['new']['directive_snippets_id']) > 0){ $snippet = $app->db->queryOneRecord("SELECT * FROM directive_snippets WHERE directive_snippets_id = ? AND type = 'nginx' AND active = 'y' AND customer_viewable = 'y'", $data['new']['directive_snippets_id']); if(isset($snippet['snippet'])){ @@ -1156,6 +1166,7 @@ class nginx_plugin { } else { $nginx_directives = $data['new']['nginx_directives']; } +/* if($data['new']['enable_pagespeed'] == 'y'){ // if PageSpeed is already enabled, don't add configuration again if(stripos($nginx_directives, 'pagespeed') !== false){ @@ -1166,9 +1177,10 @@ class nginx_plugin { } else { $vhost_data['enable_pagespeed'] = false; } +*/ } else { $nginx_directives = $data['new']['nginx_directives']; - $vhost_data['enable_pagespeed'] = false; +// $vhost_data['enable_pagespeed'] = false; } // folder_directive_snippets