diff options
Diffstat (limited to 'conf')
| -rwxr-xr-x | conf/Vagrantfile.example | 8 | ||||
| -rw-r--r-- | conf/general.yml-example | 24 |
2 files changed, 18 insertions, 14 deletions
diff --git a/conf/Vagrantfile.example b/conf/Vagrantfile.example index 8c2a32c47..98b77dcc4 100755 --- a/conf/Vagrantfile.example +++ b/conf/Vagrantfile.example @@ -38,14 +38,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| apt-get install -qq -y curl >/dev/null curl -s -O https://raw.github.com/mysociety/commonlib/master/bin/install-site.sh sh install-site.sh --dev fixmystreet vagrant 127.0.0.1.xip.io - # Assume a developer will want to run the tests. - # TODO The tests should be further altered to work regardless of - # configuration file settings - sed -i -r \ - -e "s,(MAPIT_URL:) '',\\1 'http://mapit.mysociety.org/'," \ - -e "s, - cobrand_one, - barnet\\n - bromley\\n - emptyhomes\\n - fiksgatami\\n - fixmybarangay\\n - lichfielddc\\n - reading\\n - seesomething\\n - southampton\\n - zurich," \ - -e "s, - cobrand_two: 'hostname_substring2', - fixmystreet: '.'," \ - fixmystreet/conf/general.yml # All done echo "****************" echo "You can now ssh into your vagrant box: vagrant ssh" diff --git a/conf/general.yml-example b/conf/general.yml-example index 2f78de986..f5fb89b64 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -121,16 +121,28 @@ GEOCODING_DISAMBIGUATION: '' MAP_TYPE: 'OSM' # FixMyStreet uses a templating cobrand system to provide different looks for -# different installations. If your site was at moon.example.org, and your templates -# were in the templates/web/moon directory, you would use: +# different installations. In the common case, if your templates are in the +# templates/web/moon directory and CSS in web/cobrands/moon, you just specify: # ALLOWED_COBRANDS: -# - moon: 'moon.example.org' +# - moon +# If you wish to use multiple cobrands, specify them in a list, optionally with +# hostname-matching regular expressions if the name of the cobrand is not +# enough. For example: +# ALLOWED_COBRANDS: +# - moon +# - venus +# Any hostname with 'moon' in it will use the moon cobrand, any with 'venus' +# the venus cobrand (any other the Default cobrand). Whereas: +# ALLOWED_COBRANDS: +# - moon: 'orbital' +# - venus +# Any hostname with 'orbital' in it will use the moon cobrand. # This also allows development servers to map to different cobrands if needed, # using DNS subdomains for example. ALLOWED_COBRANDS: - - cobrand_one - - cobrand_two: 'hostname_substring2' - - cobrand_three + - cobrand1 + - cobrand2: 'hostname_substring2' + - cobrand3 # 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. |