Commit 6b8a1eb4 authored by Till Brehm's avatar Till Brehm

Merge branch 'master' into 'master'

Improvements in using HTTP2 and talking about version

See merge request ispconfig/ispconfig3!705
parents 7b7c688a ddcde6b6
......@@ -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)$">
......
......@@ -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; };
};
......
......@@ -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>
......
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