diff options
| author | Ben Langfeld <ben@langfeld.me> | 2015-08-03 17:57:38 +0300 |
|---|---|---|
| committer | Ben Langfeld <ben@langfeld.me> | 2015-08-03 17:57:38 +0300 |
| commit | 9c583be1cdfab3f00dbd2fb5537b41e5748d2445 (patch) | |
| tree | 49ad2938ae7ab6a8a30879eb14fa242f67284a74 | |
| parent | 7ea89a1f447ca9ce97ac9485cf09c1a3bbd2855c (diff) | |
Match d14bf53 on Travis CI
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | devbox/nginx-default.conf | 2 | ||||
| -rw-r--r-- | devbox/provisioning.sh | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index e8b54cf..0d12451 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,8 @@ before_script: - sudo apt-get install -y nginx - sudo mkdir -p /usr/share/nginx/html - sudo cp ${TRAVIS_BUILD_DIR}/devbox/nginx-default.conf /etc/nginx/sites-available/default +- sudo sed --in-place 's|{{ROOT_DIR}}|'"$TRAVIS_BUILD_DIR"'|g' /etc/nginx/sites-available/default/nginx-default.conf - sudo /etc/init.d/nginx restart -- sudo ln -fs ${TRAVIS_BUILD_DIR} /usr/share/nginx/html/candy -- sudo ln -fs ${TRAVIS_BUILD_DIR}/devbox/index.html /usr/share/nginx/html/index.html - sudo apt-get install -y naturaldocs - npm install -g grunt-cli bower - npm install diff --git a/devbox/nginx-default.conf b/devbox/nginx-default.conf index c01a069..a5d0eda 100644 --- a/devbox/nginx-default.conf +++ b/devbox/nginx-default.conf @@ -1,5 +1,5 @@ server { - root /vagrant; + root {{ROOT_DIR}}; index devbox/index.html; charset utf-8; diff --git a/devbox/provisioning.sh b/devbox/provisioning.sh index 13dae77..33479db 100644 --- a/devbox/provisioning.sh +++ b/devbox/provisioning.sh @@ -32,6 +32,7 @@ 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 /etc/init.d/nginx restart # |