Merge branch 'master' into 'master'

Improvements in using HTTP2 and talking about version

See merge request ispconfig/ispconfig3!705

Author: Till Brehm

install/tpl/apache_ispconfig.vhost.master

@@ -8,6 +8,9 @@
 
 <VirtualHost _default_:<tmpl_var name="vhost_port">>
   ServerAdmin webmaster@localhost
+  <tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
+		Protocols h2 h2c http/1.1
+  </tmpl_if>
 
   <Directory /var/www/ispconfig/>
     <FilesMatch "\.ph(p3?|tml)$">

install/tpl/named.conf.options.master

@@ -22,8 +22,7 @@ options {
 	dnssec-validation yes;
 	dnssec-lookaside auto;
 
-	version "DNS managed by ISPConfig";
-	
+	version "DNS-Server";
 	auth-nxdomain no;    # conform to RFC1035
 	listen-on-v6 { any; };
 };

server/conf/vhost.conf.master

@@ -13,6 +13,12 @@
 <tmpl_loop name='vhosts'>
 <VirtualHost {tmpl_var name='ip_address'}:{tmpl_var name='port'}>
 <tmpl_hook name='apache2_vhost:vhost_header'>
+<tmpl_if name='enable_spdy' op='==' value='y'>
+<tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
+		Protocols h2 h2c http/1.1
+</tmpl_if>
+</tmpl_if>
+
 <tmpl_if name='php' op='==' value='suphp'>
 		DocumentRoot <tmpl_var name='web_document_root'>
 </tmpl_else>