diff options
| author | Ben Langfeld <ben@langfeld.me> | 2015-08-03 17:04:43 +0300 |
|---|---|---|
| committer | Ben Langfeld <ben@langfeld.me> | 2015-08-03 17:04:43 +0300 |
| commit | d14bf53321141416b787c3f85b39caf02af54574 (patch) | |
| tree | df38dd241a9a3bb724c6c14731c4c93627e6e965 | |
| parent | 5c5e108bcd72bd22d77acbd9a66d7c95de9362f3 (diff) | |
Simplify asset serving in development environment
| -rw-r--r-- | devbox/index.html | 10 | ||||
| -rw-r--r-- | devbox/nginx-default.conf | 4 | ||||
| -rw-r--r-- | devbox/provisioning.sh | 3 |
3 files changed, 7 insertions, 10 deletions
diff --git a/devbox/index.html b/devbox/index.html index bd97ad6..3e8de12 100644 --- a/devbox/index.html +++ b/devbox/index.html @@ -3,12 +3,12 @@ <head> <meta charset="utf-8"> <title>Candy - Chats are not dead yet</title> - <link rel="shortcut icon" href="candy/res/img/favicon.png" type="image/gif" /> - <link rel="stylesheet" type="text/css" href="candy/res/default.css" /> + <link rel="shortcut icon" href="res/img/favicon.png" type="image/gif" /> + <link rel="stylesheet" type="text/css" href="res/default.css" /> <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.js"></script> - <script type="text/javascript" src="candy/libs.bundle.js"></script> - <script type="text/javascript" src="candy/candy.bundle.js"></script> + <script type="text/javascript" src="libs.bundle.js"></script> + <script type="text/javascript" src="candy.bundle.js"></script> <script type="text/javascript"> $(document).ready(function() { Candy.init('/http-bind/', { // uncomment & comment next line if you'd like to use BOSH @@ -23,7 +23,7 @@ // -> array of rooms to join after connecting autojoin: ['test@conference.localhost'] }, - view: { assets: 'candy/res/' } + view: { assets: 'res/' } }); Candy.Core.connect('localhost'); diff --git a/devbox/nginx-default.conf b/devbox/nginx-default.conf index 6bad803..c01a069 100644 --- a/devbox/nginx-default.conf +++ b/devbox/nginx-default.conf @@ -1,6 +1,6 @@ server { - root /usr/share/nginx/html; - index index.html; + root /vagrant; + index devbox/index.html; charset utf-8; diff --git a/devbox/provisioning.sh b/devbox/provisioning.sh index 69c8a3a..13dae77 100644 --- a/devbox/provisioning.sh +++ b/devbox/provisioning.sh @@ -34,9 +34,6 @@ apt-get install -y nginx cp /vagrant/devbox/nginx-default.conf /etc/nginx/sites-available/default /etc/init.d/nginx restart -ln -fs /vagrant /usr/share/nginx/html/candy -ln -fs /vagrant/devbox/index.html /usr/share/nginx/html/index.html - # # Candy development dependencies # |