Merge remote-tracking branch 'origin/master'

This commit is contained in:
Stefan Verhoeven 2017-04-06 22:26:29 +02:00
commit 6c2de344e9

View File

@ -29,8 +29,7 @@ defaults: &defaults
internal:
protocol: 'http'
domain: 'cartodb.localhost'
port: '8181'
host: '127.0.0.1'
port: '80'
verifycert: false
private:
protocol: 'http'
@ -256,10 +255,10 @@ defaults: &defaults
debug: false
visible: true
tiler_domain: "cartodb.localhost"
tiler_port: "8181"
tiler_port: "80"
tiler_protocol: "http"
sql_domain: "cartodb.localhost"
sql_port: "8080"
sql_port: "80"
sql_protocol: "http"
extra_params: { cache_policy: 'persist' }
tile_style_history: []