Browse Source

correctly replace home directory in nginx.conf

Patrick Falls 12 years ago
parent
commit
bef3af48d0
2 changed files with 2 additions and 1 deletions
  1. 1 1
      php/deploy/nginx.conf
  2. 1 0
      php/setup.py

+ 1 - 1
php/deploy/nginx.conf

@@ -62,7 +62,7 @@ http {
         # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
         #
         location ~ \.php$ {
-            root           /home/pfalls/FrameworkBenchmarks/php;
+            root           /home/ubuntu/FrameworkBenchmarks/php;
             fastcgi_pass   127.0.0.1:9001;
             fastcgi_index  index.php;
 #            fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;

+ 1 - 0
php/setup.py

@@ -12,6 +12,7 @@ def start(args):
   setup_util.replace_text("php/dbraw.php", "host=.*;", "host=" + args.database_host + ";")
   setup_util.replace_text("php/deploy/php", "\".*\/FrameworkBenchmarks", "\"" + home + "/FrameworkBenchmarks")
   setup_util.replace_text("php/deploy/php", "Directory .*\/FrameworkBenchmarks", "Directory " + home + "/FrameworkBenchmarks")
+  setup_util.replace_text("php/deploy/nginx.conf", "root .*\/FrameworkBenchmarks", "root " + home + "/FrameworkBenchmarks")
   
   try:
     #subprocess.check_call("sudo cp php/deploy/php /etc/apache2/sites-available/", shell=True)