Merge branch 'stable-3.1' into 'stable-3.1'

Stable 3.1

See merge request ispconfig/ispconfig3!775

Author: Till Brehm

install/sql/incremental/upd_dev_collection.sql

@@ -1,3 +1,4 @@
 ALTER TABLE `web_domain` ADD COLUMN `ssl_letsencrypt_exclude` enum('n','y') NOT NULL DEFAULT 'n' AFTER `ssl_letsencrypt`;
 ALTER TABLE `remote_user` ADD `remote_access` ENUM('y','n') NOT NULL DEFAULT 'y' AFTER `remote_password`;
 ALTER TABLE `remote_user` ADD `remote_ips` TEXT AFTER `remote_access`;
+ALTER TABLE `server_php` ADD `active` enum('y','n') NOT NULL DEFAULT 'y' AFTER `php_fpm_pool_dir`;

install/sql/ispconfig3.sql

@@ -1346,6 +1346,7 @@ CREATE TABLE `server_php` (
   `php_fpm_init_script` varchar(255) DEFAULT NULL,
   `php_fpm_ini_dir` varchar(255) DEFAULT NULL,
   `php_fpm_pool_dir` varchar(255) DEFAULT NULL,
+  `active` enum('n','y') NOT NULL DEFAULT 'y',
   PRIMARY KEY (`server_php_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 

interface/web/admin/form/server_config.tform.php

@@ -814,6 +814,12 @@
 			'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',

interface/web/admin/form/server_php.tform.php

@@ -124,6 +124,13 @@
 			'width'  => '40',
 			'maxlength' => '255'
 		),
+		'active' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
+
 		//#################################
 		// ENDE Datenbankfelder
 		//#################################

interface/web/admin/lib/lang/ar_server_config.lng

@@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength';
 $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
 $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
 $wb['php_ini_check_minutes_info_txt'] = '0 = no check';
-$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available';
 $wb['web_settings_txt'] = 'Web Server';
 $wb['xmpp_server_txt'] = 'XMPP Server';
 $wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
@@ -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';
 ?>

interface/web/admin/lib/lang/ar_server_php.lng

@@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory';
 $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script';
 $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory';
 $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory';
+$wb['active_txt'] = 'Active';
 ?>

interface/web/admin/lib/lang/bg_server_config.lng

@@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength';
 $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
 $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
 $wb['php_ini_check_minutes_info_txt'] = '0 = no check';
-$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available';
 $wb['web_settings_txt'] = 'Web Server';
 $wb['xmpp_server_txt'] = 'XMPP Server';
 $wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
@@ -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';
 ?>

interface/web/admin/lib/lang/bg_server_php.lng

@@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory';
 $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script';
 $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory';
 $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory';
+$wb['active_txt'] = 'Active';
 ?>

interface/web/admin/lib/lang/br_server_config.lng

@@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'Dificuldade do DKIM';
 $wb['php_ini_check_minutes_txt'] = 'Verificar modificações do php.ini a cada N minutos';
 $wb['php_ini_check_minutes_error_empty'] = 'Por favor, insira um valor de quantas vezes o php.ini deve ser verificado por modificações.';
 $wb['php_ini_check_minutes_info_txt'] = '0 = sem verificação';
-$wb['enable_spdy_txt'] = 'Tornar SPDY disponível';
+$wb['enable_spdy_txt'] = 'Tornar SPDY/HTTP2 disponível';
 $wb['web_settings_txt'] = 'Servidor de páginas';
 $wb['xmpp_server_txt'] = 'Servidor XMPP';
 $wb['xmpp_use_ipv6_txt'] = 'Usar IPv6';
@@ -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';
 ?>

interface/web/admin/lib/lang/br_server_php.lng

@@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Caminho do diretório do php.ini';
 $wb['php_fpm_init_script_txt'] = 'Caminho do script de inicialização do PHP-FPM';
 $wb['php_fpm_ini_dir_txt'] = 'Caminho do diretório do php.ini';
 $wb['php_fpm_pool_dir_txt'] = 'Caminho do diretório de faixas (pool) do PHP-FPM';
+$wb['active_txt'] = 'Active';
 ?>