Skip to content
Snippets Groups Projects
Commit 7c7d49f8 authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge branch 'master' into 'master' 

Added Hack language
parents 6ffc7514 8edabf64
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
server/conf/vhost.conf.master
+ 7
− 4
View file @ 7c7d49f8
...@@ -333,11 +333,14 @@ ...@@ -333,11 +333,14 @@
</tmpl_if> </tmpl_if>
</Directory> </Directory>
<FilesMatch "\.php[345]?$"> <FilesMatch "\.php[345]?$">
SetHandler php5-fcgi SetHandler hhvm-fcgi
</FilesMatch> </FilesMatch>
Action php5-fcgi /php5-fcgi virtual <FilesMatch "\.hh$">
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'} SetHandler hhvm-fcgi
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 </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> </IfModule>
</tmpl_if> </tmpl_if>
......
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