From 9b155852f4a352ddb793ac4252702170b6509c17 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 11 May 2014 17:39:51 -0400
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
server/conf/vhost.conf.master | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index e7305e4..c4269d9 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -20,7 +20,11 @@
<tmpl_if name='php' op='==' value='php-fpm'>
DocumentRoot <tmpl_var name='web_document_root'>
</tmpl_else>
- DocumentRoot <tmpl_var name='web_document_root_www'>
+ <tmpl_if name='php' op='==' value='hhvm'>
+ DocumentRoot <tmpl_var name='web_document_root'>
+ </tmpl_else>
+ DocumentRoot <tmpl_var name='web_document_root_www'>
+ </tmpl_if>
</tmpl_if>
</tmpl_if>
</tmpl_if>
@@ -307,7 +311,7 @@
<FilesMatch "\.php[345]?$">
SetHandler php5-fcgi
</FilesMatch>
- Action php5-fcgi /php5-fcgi
+ Action php5-fcgi /php5-fcgi virtual
Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
<tmpl_if name='use_tcp'>
FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization
@@ -318,6 +322,28 @@
</IfModule>
</tmpl_if>
+<tmpl_if name='php' op='==' value='hhvm'>
+ <IfModule mod_fastcgi.c>
+ <Directory {tmpl_var name='document_root'}/cgi-bin>
+ <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
+ Require all granted
+ <tmpl_else>
+ Order allow,deny
+ Allow from all
+ </tmpl_if>
+ </Directory>
+ <FilesMatch "\.php[345]?$">
+ SetHandler hhvm-fcgi
+ </FilesMatch>
+ <FilesMatch "\.hh$">
+ SetHandler hhvm-fcgi
+ </FilesMatch>
+ Action hhvm-fcgi /hhvm-fcgi virtual
+ Alias /hhvm-fcgi {tmpl_var name='document_root'}/cgi-bin/hhvm-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
+ FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/hhvm-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket /var/run/hhvm/hhvm.<tmpl_var name='system_user'>.sock -pass-header Authorization
+ </IfModule>
+</tmpl_if>
+
<tmpl_if name="rewrite_enabled">
RewriteEngine on
<tmpl_if name='seo_redirect_enabled'>
--
Gitblit v1.9.1