Browse Source

setup file wasn't rewriting home directory

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

+ 1 - 1
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 / {

+ 1 - 0
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)

+ 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/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;