Merge new config

remotes/origin/no-uploadlimit-63
Stefan Verhoeven 9 years ago
parent f941e5f4be
commit 90124b61d6

@ -1,6 +1,6 @@
defaults: &defaults
ogr2ogr:
binary: 'which ogr2ogr'
binary: 'which ogr2ogr2'
csv_guessing: false
debug_assets: true
mandatory_keys: [layer_opts, sql_api, varnish_management, redis, session_domain]
@ -12,10 +12,14 @@ defaults: &defaults
secret_token: '71c2b25921b84a1cb21c71503ab8fb23'
account_host: 'cartodb.localhost:3000'
account_path: '/account'
data_library:
username: 'common-data'
path: '/data-library'
disable_file: '~/disable'
watcher:
ttl: 60
tiler:
filter: 'mapnik'
internal:
protocol: 'http'
domain: 'cartodb.localhost'
@ -59,15 +63,59 @@ defaults: &defaults
app_keys:
editor: ''
embeds: ''
facebook:
app_id: ''
admins: ''
hubspot: ''
segment:
api_key:
metrics:
hubspot:
events_host: 'http://track.hubspot.com'
token: 'yourtoken'
form_ids:
newsletter: ''
event_ids:
import_failed: ''
geocoding_failed: ''
import_success: ''
geocoding_success: ''
published_visualization: ''
visited_dashboard: ''
connect_dataset: ''
create_map: ''
export_table: ''
select_wms: ''
color_basemap: ''
pattern_basemap: ''
geocoding: ''
visual_merge: ''
common_data: ''
cartocss_manually: ''
wizard: ''
filter: ''
query: ''
mailing_track:
like_map: ''
trending_map: ''
common_data:
protocol: 'https'
username: 'common-data'
host: 'cartodb.com'
format: 'shp'
generate_every: 86400
explore-api:
explore_api:
username: ''
reports:
mail_to: ''
mailer:
from: 'cartodb.com <support@cartodb.com>'
address: ''
port: ''
user_name: ''
password: ''
authentication: ''
enable_starttls_auto: ''
varnish_management:
critical: false
host: '127.0.0.1'
@ -75,6 +123,16 @@ defaults: &defaults
purge_command: 'purge'
retries: 5
timeout: 5
# 'warning' or 'error'
trigger_verbose: true
invalidation_service:
enabled: false
host: '127.0.0.1'
port: 3142
retries: 5 # number of retries before considering failure
critical: false # either the failure is considered an error or a warning
timeout: 5 # socket timeout
trigger_verbose: true
redis:
host: '127.0.0.1'
port: 6379
@ -84,18 +142,18 @@ defaults: &defaults
api_credentials: 3
users_metadata: 5
redis_migrator_logs: 6
# mixpanel:
# api_key: xxx
# api_secret: xxx
# token: xxx
# github:
# repo: xxx
# org: xxx
# auth: xxx:xxx
org_metadata_api:
host: 'localhost.lan'
port: '3000'
username: "extension"
password: "elephant"
timeout: 10
superadmin:
username: "superadmin"
password: "monkey"
geocoder:
#force_batch: true
#disable_cache: true
app_id: ''
token: ''
mailto: ''
@ -108,6 +166,11 @@ defaults: &defaults
base_url: ''
api_key: ''
table_name: ''
api:
host: 'cartodb.localhost'
port: '8787'
dbname: 'geocoder'
user: 'geocoder'
importer:
content_guessing: # Depends on geocoding
enabled: false # Disabled if false or not present
@ -120,6 +183,9 @@ defaults: &defaults
bucket_name:
url_ttl:
async_long_uploads: false
unp_temporal_folder: '/tmp/imports/'
# It must end in `/uploads` and be accessible via HTTP, if relative will default to Rails.Root/#{uploads_path}
uploads_path: 'public/uploads'
error_track:
url: 'https://viz2.cartodb.com/api/v1/sql'
percent_users: 10
@ -131,7 +197,7 @@ defaults: &defaults
public_opts: ["type", "active", "query", "opacity", "auto_bound",
"interactivity", "debug", "visible", "tiler_domain",
"tiler_port", "tiler_protocol", "sql_domain", "sql_port",
"sql_protocol", "extra_params", "cdn_url", "table_name",
"sql_protocol", "extra_params", "table_name",
"user_name", "style_version", "tile_style", "query_wrapper"]
default_tile_styles:
point: "{\n marker-fill: #FF6600;\n marker-opacity: 0.9;\n marker-width: 12;\n marker-line-color: white;\n marker-line-width: 3;\n marker-line-opacity: 0.9;\n marker-placement: point;\n marker-type: ellipse;\n marker-allow-overlap: true;\n}"
@ -142,6 +208,7 @@ defaults: &defaults
data:
kind: "carto"
options:
# attribution: 'CartoDB attribution'
query: ""
opacity: 0.99
auto_bound: false
@ -155,7 +222,6 @@ defaults: &defaults
sql_port: "8080"
sql_protocol: "http"
extra_params: { cache_policy: 'persist' }
cdn_url: ""
tile_style_history: []
style_version: "2.1.1"
infowindow:
@ -163,20 +229,6 @@ defaults: &defaults
background:
kind: "background"
options: { color: '#ffffff' }
base:
kind: "tiled"
options:
visible: true
type: "Tiled"
urlTemplate: "https://maps.nlp.nokia.com/maptiler/v2/maptile/newest/normal.day/{z}/{x}/{y}/256/png8?lg=eng&token=A7tBPacePg9Mj_zghvKt9Q&app_id=KuYppsdXZznpffJsKT24"
name: 'Nokia Day'
className: "nokia_day"
attribution: "©2012 Nokia <a href='http://here.net/services/terms' target='_blank'>Terms of use</a>"
gmaps:
kind: "gmapsbase"
options:
base_type: "roadmap"
style: ""
cartodb_com_hosted: false
cartodb_central_domain_name: 'cartodb.localhost'
aws:
@ -205,6 +257,10 @@ defaults: &defaults
users_dumps:
service:
port: 00000
http_header_authentication:
header: # name of the trusted, safe header that your server adds to the request
field: # 'email' / 'username' / 'id' / 'auto' (autodetection)
autocreation: # true / false (true requires field to be email)
oauth:
# If the client_id/app_key is not set won't appear at the UI. @see application_helper.rb -> frontend_config
# Must be the same as CartoDB::Datasources::xxxx DATASOURCE_NAME constants
@ -221,6 +277,11 @@ defaults: &defaults
app_key: ''
app_secret: ''
callback_url: ''
box:
application_name: ''
client_id: ''
client_secret: ''
box_host: "app.box.com"
instagram:
app_key: ''
app_secret: ''
@ -352,12 +413,22 @@ defaults: &defaults
className: 'midnight_cartodb'
attribution: ''
Stamen:
toner_stamen_labels:
url: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner-background/{z}/{x}/{y}.png'
subdomains: 'abcd'
minZoom: '0'
maxZoom: '18'
name: 'Toner'
className: 'toner_stamen_labels'
attribution: 'Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.'
labels:
url: 'http://{s}.tile.stamen.com/toner-labels/{z}/{x}/{y}.png'
toner_stamen:
url: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner/{z}/{x}/{y}.png'
subdomains: 'abcd'
minZoom: '0'
maxZoom: '18'
name: 'Toner'
name: 'Toner (labels below)'
className: 'toner_stamen'
attribution: 'Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.'
toner_background_stamen:

Loading…
Cancel
Save