setup file wasn't rewriting home directory

Dith3r · Apr 2, 2013 · 34b0566 · 34b0566
1 parent 4a71115
commit 34b0566
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/cake/deploy/nginx.conf b/cake/deploy/nginx.conf
@@ -59,7 +59,7 @@ http {
         #    proxy_pass   http://127.0.0.1;
         #}
 
-        root   /home/ubuntu/FrameworkBenchmarks/cake/app/webroot/;
+        root /home/ubuntu/FrameworkBenchmarks/cake/app/webroot/;
         index  index.php;
 
         location / {

diff --git a/cake/setup.py b/cake/setup.py
@@ -10,6 +10,7 @@ def start(args):
   setup_util.replace_text("cake/app/Config/database.php", "'host' => '.*',", "'host' => '" + args.database_host + "',")
   setup_util.replace_text("cake/deploy/cake", "\".*\/FrameworkBenchmarks", "\"" + home + "/FrameworkBenchmarks")
   setup_util.replace_text("cake/deploy/cake", "Directory .*\/FrameworkBenchmarks", "Directory " + home + "/FrameworkBenchmarks")
+  setup_util.replace_text("cake/deploy/nginx.conf", "root .*\/FrameworkBenchmarks", "root " + home + "/FrameworkBenchmarks")
 
   try:
     #subprocess.check_call("sudo cp cake/deploy/cake /etc/apache2/sites-available/", shell=True)

diff --git a/php/deploy/nginx.conf b/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/ubuntu/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;