Merge pull request #1829 from krahulreddy/websiteSetup

Added setup-website option

diff --combined .travis.yml
index 08aa9eb48ab46c164ee58011a763a6e686b2d217,578bdd61c6cd40e9ff40358851ef2f63abae80fa..4461add9f454f8150f5ea5ffebdb5e937d3405eb
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -26,6 -26,8 +26,8 @@@ script
    - if [[ $TEST_SUITE == "tests" ]]; then phpcs --report-width=120 . ; fi
    - cd $TRAVIS_BUILD_DIR/test/php
    - if [[ $TEST_SUITE == "tests" ]]; then /usr/bin/phpunit ./ ; fi
+   - cd $TRAVIS_BUILD_DIR/build
+   - /usr/bin/env php ./utils/setup.php --setup-website
    - cd $TRAVIS_BUILD_DIR/test/bdd
    - # behave --format=progress3 api
    - if [[ $TEST_SUITE == "tests" ]]; then behave -DREMOVE_TEMPLATE=1 --format=progress3 db ; fi
@@@ -35,7 -37,5 +37,7 @@@
    - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | grep -v 'ETA (seconds)'; fi
    - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/specialphrases.php --wiki-import | psql -d test_api_nominatim >/dev/null; fi
    - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/check_import_finished.php; fi
 +  - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/update.php --init-updates; fi
 +  - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/update.php --import-osmosis; fi
  notifications:
    email: false