Merge branch 'feature/add_spdy_option' into 'master'

Falko Timme

2014-12-11 256e08fcd57b51286169ff8799734398660f2726

Merge branch 'feature/add_spdy_option' into 'master'

Add Spdy

Add Spdy option on SSL-tabs

See merge request !142

 install/sql/incremental/upd_0080.sql

New file
@@ -0,0 +1 @@
ALTER TABLE `web_domain` ADD COLUMN `enable_spdy` ENUM('y','n') NULL DEFAULT 'n' AFTER `proxy_directives`;

 install/sql/ispconfig3.sql

@@ -1877,6 +1877,7 @@
  `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 NOT NULL DEFAULT '0000-00-00',

 install/tpl/server.ini.master

@@ -85,6 +85,7 @@
php_ini_path_cgi=/etc/php5/cgi/php.ini
check_apache_config=y
enable_sni=y
enable_spdy=n
enable_ip_wildcard=y
overtraffic_notify_admin=y
overtraffic_notify_client=y

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

@@ -1021,6 +1021,15 @@
            'width' => '40',
            'maxlength' => '255'
        ),
        'enable_spdy' => array (
            'datatype' => 'VARCHAR',
            'formtype' => 'CHECKBOX',
            'default'  => 'n',
            'value' => array (
                0 => 'n',
                1 => 'y'
            )
        ),
        'apps_vhost_port' => array(
            'datatype' => 'VARCHAR',
            'formtype' => 'TEXT',

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

@@ -262,4 +262,5 @@
$wb['php_ini_check_minutes_error_empty'] = 'Bitte geben Sie einen Wert an, wie oft die php.ini auf Änderungen geprüft werden soll.';
$wb['php_ini_check_minutes_info_txt'] = '0 = keine Prüfung';
$wb['php_handler_txt'] = 'Standard-PHP-Handler';
$wb['enable_spdy_txt'] = 'Stellt SPDY zur Verfügung';
?>

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

@@ -263,4 +263,5 @@
$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';
?>

 interface/web/admin/templates/server_config_web_edit.htm

@@ -161,6 +161,14 @@
                        {tmpl_var name='enable_sni'}
                    </div>
                </div>
                <div class="ctrlHolder">
                    <p class="label">
                        <tmpl_var name="enable_spdy_txt">
                    </p>
                    <div class="multiField">
                        <tmpl_var name="enable_spdy">
                    </div>
                </div>
                <div class="ctrlHolder">
                    <label for="CA_path">{tmpl_var name='CA_path_txt'}</label>
                    <input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" autocomplete="off" class="textInput" />

 interface/web/sites/form/web_vhost_domain.tform.php

@@ -523,6 +523,15 @@
                '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'
                )
            ),
            //#################################
            // ENDE Datatable fields
            //#################################

 interface/web/sites/lib/lang/de_web_vhost_domain.lng

@@ -136,4 +136,5 @@
$wb['apache_directive_blocked_error'] = 'Die Apache Direktive wurde durch die Sicherheitsrichtline blockiert:';
$wb['btn_save_txt'] = 'Speichern';
$wb['btn_cancel_txt'] = 'Abbrechen';
$wb['enable_spdy_txt'] = 'Aktiviere SPDY';
?>

 interface/web/sites/lib/lang/en_web_vhost_domain.lng

@@ -139,4 +139,5 @@
$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
$wb['btn_save_txt'] = "Save";
$wb['btn_cancel_txt'] = "Cancel";
$wb['enable_spdy_txt'] = 'Enable SPDY';
?>

 interface/web/sites/templates/web_vhost_domain_advanced.htm

@@ -176,4 +176,4 @@
        });
    }
            
</script>
</script>

 interface/web/sites/templates/web_vhost_domain_ssl.htm

@@ -64,6 +64,12 @@
                    {tmpl_var name='ssl_action'}
                </select>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='enable_spdy_txt'}</p>
                <div class="multiField">
                    {tmpl_var name="enable_spdy"}
                </div>
            </div>
        </fieldset>

        <input type="hidden" name="id" value="{tmpl_var name='id'}">
@@ -74,4 +80,4 @@
        </div>
    </div>

</div>
</div>

 server/conf/apache_apps.vhost.master

@@ -10,11 +10,17 @@
<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>
  

  {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

 server/conf/nginx_vhost.conf.master

@@ -5,10 +5,10 @@
</tmpl_if>
        
<tmpl_if name='ssl_enabled'>
        listen <tmpl_var name='ip_address'>:443 ssl;
        listen <tmpl_var name='ip_address'>:443 ssl{tmpl_if name='enable_spdy' op='==' value='y'} spdy{/tmpl_if};
        ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
<tmpl_if name='ipv6_enabled'>
        listen [<tmpl_var name='ipv6_address'>]:443 ssl;
        listen [<tmpl_var name='ipv6_address'>]:443 ssl{tmpl_if name='enable_spdy' op='==' value='y'} spdy{/tmpl_if};;
</tmpl_if>
        ssl_certificate <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.crt;
        ssl_certificate_key <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.key;
@@ -242,4 +242,4 @@
        }
</tmpl_if>
}
</tmpl_loop>
</tmpl_loop>