From e25e407913f0248ba6d68fa80b001b0f4621d99a Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 30 Apr 2014 05:35:22 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
server/conf/vhost.conf.master | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index e7305e4..07f7a4a 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>
@@ -318,6 +322,25 @@
</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 php5-fcgi
+ </FilesMatch>
+ Action php5-fcgi /php5-fcgi
+ 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'}
+ 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 -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