Browse Source

Correct a couple of paths that got sed'ed.

Joshua Maddux 10 years ago
parent
commit
bffce95263
2 changed files with 5 additions and 3 deletions
  1. 3 3
      frameworks/PHP/hhvm/deploy/nginx.conf
  2. 2 0
      frameworks/PHP/hhvm/setup_hhvm.sh

+ 3 - 3
frameworks/PHP/hhvm/deploy/nginx.conf

@@ -15,7 +15,7 @@ events {
 
 
 http {
-    include       /home/vagrant/FrameworkBenchmarks/installs/nginx/conf/mime.types;
+    include       /usr/local/nginx/conf/mime.types;
     default_type  application/octet-stream;
 
     #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
@@ -79,13 +79,13 @@ http {
 #            include        /home/vagrant/FrameworkBenchmarks/installs/nginx/conf/fastcgi_params;
 #        }
         location ~ \.(hh|php)$ {
-            root /FrameworkBenchmarks/frameworks/PHP/hhvm;
+            root TEST_ROOT;
             #fastcgi_keep_conn on;
             fastcgi_pass   fastcgi_backend;
             #fastcgi_pass   127.0.0.1:9001;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            include        /home/vagrant/FrameworkBenchmarks/installs/nginx/conf/fastcgi_params;
+            include        /usr/local/nginx/conf/fastcgi_params;
         }
 
         # deny access to .htaccess files, if Apache's document root

+ 2 - 0
frameworks/PHP/hhvm/setup_hhvm.sh

@@ -5,6 +5,8 @@ sed -i 's|SourceRoot = .*/FrameworkBenchmarks/hhvm|SourceRoot = '"${TROOT}"'|g'
 sed -i 's|Path = .*/.hhvm.hhbc|Path = '"${TROOT}"'/.hhvm.bbhc|g' deploy/config.hdf
 sed -i 's|PidFile = .*/hhvm.pid|PidFile = '"${TROOT}"'/hhvm.pid|g' deploy/config.hdf
 sed -i 's|File = .*/error.log|File = '"${TROOT}"'/error.log|g' deploy/config.hdf
+sed -i "s|/usr/local/nginx/|${IROOT}/nginx/|g" deploy/nginx.conf
+sed -i "s|TEST_ROOT|${TROOT}|g" deploy/nginx.conf
 
 hhvm --config $TROOT/deploy/config.hdf -m daemon
 $NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf