Implemented: FS#3266 - HHVM PHP mode support (some improvements, nginx supp...

Marius Cramer

2014-04-30 1c6da3502e13ca5391b5ece1349b8401876e4b99

 server/conf/vhost.conf.master

@@ -1,12 +1,12 @@

<Directory {tmpl_var name='web_basedir'}/{tmpl_var name='domain'}>
      AllowOverride None
      {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
      Require all deny
      {tmpl_else}
      <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
      Require all denied
      <tmpl_else>
      Order Deny,Allow
      Deny from all
      {/tmpl_if}
      </tmpl_if>
</Directory>

<tmpl_loop name="vhosts">
@@ -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>
@@ -57,14 +61,14 @@
      </IfModule>

      <Directory {tmpl_var name='web_document_root_www'}>
            Options FollowSymLinks
            Options +FollowSymLinks
            AllowOverride <tmpl_var name='allow_override'>
            {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
            <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
            Require all granted
            {tmpl_else}
            <tmpl_else>
            Order allow,deny
            Allow from all
            {/tmpl_if}
            </tmpl_if>
<tmpl_if name='ssi' op='==' value='y'>

            # ssi enabled
@@ -74,25 +78,25 @@
</tmpl_if>
<tmpl_if name='php' op='==' value='no'>
            <Files ~ '.php[s3-6]{0,1}$'>
                  {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
                  <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
                  Require all denied
                  {tmpl_else}
                  <tmpl_else>
                  Order allow,deny
                  Deny from all
                  Allow from none
                  {/tmpl_if}
                  </tmpl_if>
            </Files>
</tmpl_if>
      </Directory>
      <Directory {tmpl_var name='web_document_root'}>
            Options FollowSymLinks
            Options +FollowSymLinks
            AllowOverride <tmpl_var name='allow_override'>
            {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
            <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
            Require all granted
            {tmpl_else}
            <tmpl_else>
            Order allow,deny
            Allow from all
            {/tmpl_if}
            </tmpl_if>
<tmpl_if name='ssi' op='==' value='y'>

            # ssi enabled
@@ -102,13 +106,13 @@
</tmpl_if>
<tmpl_if name='php' op='==' value='no'>
            <Files ~ '.php[s3-6]{0,1}$'>
               {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
               <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
               Require all denied
               {tmpl_else}
               <tmpl_else>
               Order allow,deny
               Deny from all
               Allow from none
               {/tmpl_if}
               </tmpl_if>
            </Files>
</tmpl_if>
      </Directory>
@@ -142,6 +146,11 @@
            PerlOptions +ParseHeaders
            Options +ExecCGI
         </Directory>
         <Directory {tmpl_var name='web_document_root'}>
            PerlResponseHandler ModPerl::Registry
            PerlOptions +ParseHeaders
            Options +ExecCGI
         </Directory>
            <Files *.pl>
            SetHandler perl-script
            </Files>
@@ -151,7 +160,9 @@
<tmpl_if name='python' op='==' value='y'>
      <IfModule mod_python.c>
         <Directory {tmpl_var name='web_document_root_www'}>
            AddHandler mod_python .py
            <FilesMatch "\.py$">
               SetHandler mod_python
            </FilesMatch>
            PythonHandler mod_python.publisher
            PythonDebug On
         </Directory>
@@ -161,16 +172,17 @@
<tmpl_if name='cgi' op='==' value='y'>
      # cgi enabled
   <Directory {tmpl_var name='document_root'}/cgi-bin>
         {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
         <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
         Require all granted
         {tmpl_else}
         <tmpl_else>
         Order allow,deny
         Allow from all
         {/tmpl_if}
         </tmpl_if>
      </Directory>
      ScriptAlias  /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
      AddHandler cgi-script .cgi
      AddHandler cgi-script .pl
      <FilesMatch "\.(cgi|pl)$">
         SetHandler cgi-script
      </FilesMatch>
</tmpl_if>
<tmpl_if name='suexec' op='==' value='y'>
      # suexec enabled
@@ -179,7 +191,7 @@
      </IfModule>
</tmpl_if>
      # Clear PHP settings of this website
      <FilesMatch "\.ph(p3?|tml)$">
      <FilesMatch ".+\.ph(p[345]?|t|tml)$">
            SetHandler None
      </FilesMatch>
<tmpl_if name='php' op='==' value='mod'>
@@ -197,13 +209,15 @@
      # suphp enabled
      <Directory {tmpl_var name='web_document_root'}>
      <IfModule mod_suphp.c>
            suPHP_Engine on
            # suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
         suPHP_Engine on
         # suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
<tmpl_if name='has_custom_php_ini'>
   suPHP_ConfigPath <tmpl_var name='custom_php_ini_dir'>
</tmpl_if>
            AddHandler x-httpd-suphp .php .php3 .php4 .php5
            suPHP_AddHandler x-httpd-suphp
         <FilesMatch "\.php[345]?$">
            SetHandler x-httpd-suphp
         </FilesMatch>
         suPHP_AddHandler x-httpd-suphp
      </IfModule>
      </Directory>
</tmpl_if>
@@ -211,14 +225,16 @@
      # php as cgi enabled
      ScriptAlias /php5-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
      Action php5-cgi /php5-cgi
      AddHandler php5-cgi .php .php3 .php4 .php5
      <FilesMatch "\.php[345]?$">
         SetHandler php5-cgi
      </FilesMatch>
      <Directory {tmpl_var name='cgi_starter_path'}>
         {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
         <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
         Require all granted
         {tmpl_else}
         <tmpl_else>
         Order allow,deny
         Allow from all
         {/tmpl_if}
         </tmpl_if>
      </Directory>
</tmpl_if>
<tmpl_if name='php' op='==' value='fast-cgi'>
@@ -231,7 +247,7 @@
            # FcgidMaxProcesses 1000
            FcgidMaxRequestsPerProcess <tmpl_var name='fastcgi_max_requests'>
            FcgidMinProcessesPerClass 0
            FcgidMaxProcessesPerClass 100
            FcgidMaxProcessesPerClass 10
            FcgidConnectTimeout 3
            FcgidIOTimeout 600
            FcgidBusyTimeout 3600
@@ -248,41 +264,53 @@
</tmpl_if>
      </IfModule>
      <Directory {tmpl_var name='web_document_root_www'}>
            AddHandler fcgid-script .php .php3 .php4 .php5
            <FilesMatch "\.php[345]?$">
               SetHandler fcgid-script
            </FilesMatch>
            FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
            FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php3
            FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php4
            FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php5
            Options +ExecCGI
            AllowOverride <tmpl_var name='allow_override'>
            {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
            <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
            Require all granted
            {tmpl_else}
            <tmpl_else>
            Order allow,deny
            Allow from all
            {/tmpl_if}
            </tmpl_if>
      </Directory>
      <Directory {tmpl_var name='web_document_root'}>
            AddHandler fcgid-script .php .php3 .php4 .php5
            <FilesMatch "\.php[345]?$">
               SetHandler fcgid-script
            </FilesMatch>
            FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
            FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php3
            FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php4
            FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php5
            Options +ExecCGI
            AllowOverride <tmpl_var name='allow_override'>
            {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
            <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
            Require all granted
            {tmpl_else}
            <tmpl_else>
            Order allow,deny
            Allow from all
            {/tmpl_if}
            </tmpl_if>
      </Directory>
</tmpl_if>
<tmpl_if name='php' op='==' value='php-fpm'>
      <IfModule mod_fastcgi.c>
            <Directory {tmpl_var name='document_root'}/cgi-bin>
               {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
               <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
               Require all granted
               {tmpl_else}
               <tmpl_else>
               Order allow,deny
               Allow from all
               {/tmpl_if}
               </tmpl_if>
             </Directory>
                AddHandler php5-fcgi .php
            <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'}
<tmpl_if name='use_tcp'>
@@ -291,6 +319,25 @@
<tmpl_if name='use_socket'>
                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 <tmpl_var name='fpm_socket'> -pass-header Authorization
</tmpl_if>
      </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>

@@ -308,6 +355,7 @@
      RewriteCond %{HTTP_HOST}   <tmpl_var name='rewrite_domain'>$ [NC]
<tmpl_if name="rewrite_is_url" op="==" value="n">
      RewriteCond %{REQUEST_URI} !^/webdav/
      RewriteCond %{REQUEST_URI} !^/php5-fcgi/
      RewriteCond %{REQUEST_URI} !^<tmpl_var name='rewrite_target'>
</tmpl_if>
      RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if>  <tmpl_var name='rewrite_type'>
@@ -339,4 +387,4 @@

<tmpl_var name='apache_directives'>
</VirtualHost>
</tmpl_loop>
</tmpl_loop>