diff options
| author | Michael Weibel <mweibel@users.noreply.github.com> | 2016-01-27 09:48:54 +0300 |
|---|---|---|
| committer | Michael Weibel <mweibel@users.noreply.github.com> | 2016-01-27 09:48:54 +0300 |
| commit | a8a18d21fb20dfebd696034f23fea7cd6520087c (patch) | |
| tree | a528de4b2798c3cdbd3b67c57f57ba17f81f020f | |
| parent | fc6c65df67de01ccfd4a07de2ba63412ff7f0a17 (diff) | |
| parent | 4938fe3d4a3d8436f366b84cc40b0a4afa3be163 (diff) | |
Merge pull request #458 from sww314/master
Fix #456 to allow setup.sh to run correctly
| -rw-r--r-- | devbox/nginx-default.conf | 6 | ||||
| -rw-r--r-- | devbox/provisioning.sh | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/devbox/nginx-default.conf b/devbox/nginx-default.conf index a5d0eda..eade376 100644 --- a/devbox/nginx-default.conf +++ b/devbox/nginx-default.conf @@ -1,10 +1,14 @@ server { root {{ROOT_DIR}}; - index devbox/index.html; charset utf-8; server_name localhost; + # Redirect to devbox/index.html + # = means exact location + location = / { + try_files /devbox/index.html =404; + } location /http-bind/ { proxy_pass http://localhost:5280/http-bind/; diff --git a/devbox/provisioning.sh b/devbox/provisioning.sh index aa8cd25..e52c891 100644 --- a/devbox/provisioning.sh +++ b/devbox/provisioning.sh @@ -31,21 +31,21 @@ cp /vagrant/devbox/prosody.cfg.lua /etc/prosody/prosody.cfg.lua # apt-get install -y nginx cp /vagrant/devbox/nginx-default.conf /etc/nginx/sites-available/default -sed --in-place 's|{{ROOT_DIR}}|/vagrant|g' /etc/nginx/sites-available/default/nginx-default.conf +sed --in-place 's|{{ROOT_DIR}}|/vagrant|g' /etc/nginx/sites-available/default /etc/init.d/nginx restart # # Candy development dependencies # -sudo add-apt-repository ppa:chris-lea/node.js -sudo apt-get update -sudo apt-get install -y nodejs git +add-apt-repository ppa:chris-lea/node.js +apt-get update +apt-get install -y nodejs git npm install -g grunt-cli npm install -g bower cd /vagrant -su -u vagrant npm install -su -u vagrant bower install +sudo -H -u vagrant npm install +sudo -H -u vagrant bower install # # Selenium & PhantomJS for testing |