diff options
| author | Edmund von der Burg <evdb@mysociety.org> | 2013-09-05 15:00:15 +0100 |
|---|---|---|
| committer | Edmund von der Burg <evdb@mysociety.org> | 2013-09-10 15:40:08 +0100 |
| commit | d6b5c4b9b71c394cd436193d85a207f7334e09f0 (patch) | |
| tree | 1d22fc727bb23ea5cc949bc3459b699a7c1773ac | |
| parent | c1f3b7df4055fc15df1afefd47482f24c5f9fc04 (diff) | |
Make changes needed to run Zurich tests on travis
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | conf/general.yml-example | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 709342dc8..32e8ae28c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ before_install: - cpanm -q DIME::Tools --force # And let's install the same version the carton.lock file currently has. - cpanm -q MKUTTER/SOAP-Lite-0.715.tar.gz - - sudo locale-gen cy_GB.UTF-8 en_GB.UTF-8 nb_NO.UTF-8 + - sudo locale-gen cy_GB.UTF-8 en_GB.UTF-8 nb_NO.UTF-8 de_CH.UTF-8 install: - carton install --deployment before_script: @@ -36,6 +36,7 @@ before_script: sed -r -e "s,(FMS_DB_USER:) 'fms',\\1 'postgres'," -e "s,cobrand_one,fixmystreet," -e "s,cobrand_two: 'hostname_substring2',fixmystreet: 'localhost'," + -e "s,cobrand_three,zurich," -e "s,(BASE_URL:) 'http://www.example.org',\\1 'http://localhost'," -e "s,(MAPIT_URL:) '',\\1 'http://mapit.mysociety.org/'," conf/general.yml-example > conf/general.yml diff --git a/conf/general.yml-example b/conf/general.yml-example index e35bb4979..2f78de986 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -130,6 +130,7 @@ MAP_TYPE: 'OSM' ALLOWED_COBRANDS: - cobrand_one - cobrand_two: 'hostname_substring2' + - cobrand_three # This is only used in "offensive report" emails to provide a link directly to # the admin interface. If wanted, set to the full URL of your admin interface. |