diff --git a/cake/deploy/nginx.conf b/cake/deploy/nginx.conf index 4af8bce9606..f364e60280e 100644 --- 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 index b9ae012085f..86cb9cba897 100644 --- 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 index 89606c55d60..c0d6e54126e 100644 --- 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;