From 8ff9dcd9528e1c22269bdb44ad2d478924c6e89c Mon Sep 17 00:00:00 2001 From: Stefan Verhoeven Date: Wed, 4 Apr 2018 22:23:54 +0200 Subject: [PATCH] Sync config files Refs #29 --- config/CartoDB-dev.js | 13 +++++ config/app_config.yml | 110 ++++++++++++++++++++++++++++++++---------- 2 files changed, 98 insertions(+), 25 deletions(-) diff --git a/config/CartoDB-dev.js b/config/CartoDB-dev.js index f4a8ed0..8aab02b 100644 --- a/config/CartoDB-dev.js +++ b/config/CartoDB-dev.js @@ -98,3 +98,16 @@ module.exports.health = { query: 'select 1' }; module.exports.disabled_file = 'pids/disabled'; + +module.exports.ratelimits = { + // whether it should rate limit endpoints (global configuration) + rateLimitsEnabled: false, + // whether it should rate limit one or more endpoints (only if rateLimitsEnabled = true) + endpoints: { + query: false, + query_format: false, + job_create: false, + job_get: false, + job_delete: false + } +} diff --git a/config/app_config.yml b/config/app_config.yml index a5bd205..513d4e3 100644 --- a/config/app_config.yml +++ b/config/app_config.yml @@ -16,6 +16,11 @@ defaults: &defaults https_port: # nil|integer. HTTPS port to use when building urls. Leave empty to use default (443) secret_token: '71c2b25921b84a1cb21c71503ab8fb23' account_host: 'cartodb.localhost:3000' + # Here you can define other hosts different to account_host that also will be CORS enabled + # cors_enabled_hosts: + # - example.com + # - foo.bar + # - carto.dev account_path: '/account' vizjson_cache_domains: ['.localhost'] data_library: @@ -161,6 +166,7 @@ defaults: &defaults api_credentials: 3 users_metadata: 5 redis_migrator_logs: 6 + limits_metadata: 8 org_metadata_api: host: 'localhost.lan' port: '3000' @@ -185,6 +191,10 @@ defaults: &defaults base_url: '' api_key: '' table_name: '' + mapzen: + search_bar_api_key: '' + mapbox: + search_bar_api_key: '' user_migrator: user_exports_folder: '/tmp/user_exports' user_imports_folder: '/tmp/user_imports' @@ -194,7 +204,14 @@ defaults: &defaults bucket_name: '' url_ttl: 7200 async_long_uploads: false + region: '' uploads_path: 'public/uploads' + pg_dump_bin_path: + '9.5': 'pg_dump' + '10': 'pg_dump' + pg_restore_bin_path: + '9.5': 'pg_restore' + '10': 'pg_restore' exporter: exporter_temporal_folder: '/tmp/exporter' s3: @@ -204,6 +221,7 @@ defaults: &defaults url_ttl: 7200 async_long_uploads: false s3_endpoint: '' + region: '' uploads_path: 'public/uploads' # including 'uploads' assumes public path. Absolute path example: /tmp/exports/downloads importer: blacklisted_ip_addr: [] @@ -219,8 +237,8 @@ defaults: &defaults url_ttl: async_long_uploads: false proxy_uri: - use_ssl: True - s3_endpoint: '' + s3_endpoint: '' # :use_ssl has been removed. Version 2 uses SSL everywhere. To disable SSL you must configure an :endpoint that uses http://. + region: '' unp_temporal_folder: '/tmp/imports/' # It must end in `/uploads` and be accessible via HTTP, if relative will default to Rails.Root/#{uploads_path} @@ -240,7 +258,7 @@ defaults: &defaults "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}" - geometry: "{\n // points\n [mapnik-geometry-type=point] {\n    marker-fill: #FF6600;\n    marker-opacity: 1;\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;marker-allow-overlap: true;\n  }\n\n //lines\n [mapnik-geometry-type=linestring] {\n    line-color: #FF6600; \n    line-width: 2; \n    line-opacity: 0.7;\n  }\n\n //polygons\n [mapnik-geometry-type=polygon] {\n    polygon-fill:#FF6600;\n    polygon-opacity: 0.7;\n    line-opacity:1;\n    line-color: #FFFFFF;\n   }\n }" + geometry: "{\n // points\n [mapnik-geometry-type=point] {\n marker-fill: #FF6600;\n marker-opacity: 1;\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;marker-allow-overlap: true;\n }\n\n //lines\n [mapnik-geometry-type=linestring] {\n line-color: #FF6600; \n line-width: 2; \n line-opacity: 0.7;\n }\n\n //polygons\n [mapnik-geometry-type=polygon] {\n polygon-fill:#FF6600;\n polygon-opacity: 0.7;\n line-opacity:1;\n line-color: #FFFFFF;\n }\n }" polygon: "{\n polygon-fill:#FF6600;\n polygon-opacity: 0.7;\n line-opacity:1;\n line-color: #FFFFFF;\n}" multipolygon: "{\n polygon-fill:#FF6600;\n polygon-opacity: 0.7;\n line-opacity:1;\n line-color: #FFFFFF;\n}" multilinestring: "{\n line-color:#FF6600;\n line-width:1;\n line-opacity: 0.7;\n}" @@ -274,9 +292,11 @@ defaults: &defaults s3: access_key_id: "test" secret_access_key: "test" + region: '' assets: s3_bucket_name: "tests" max_file_size: 5242880 # 5.megabytes + region: '' # Example for configuring organization assets. # If 'aws.s3' configuration exists, S3 is used for storing assets and 'assets.organization.bucket' value is required. If 'aws.s3' config is not present, assets will be stored locally. # organization: @@ -316,6 +336,7 @@ defaults: &defaults callback_url: 'https://carto.com' # google_plus: # client_id: '' + # client_secret: '' # cookie_policy: 'single_host_origin' # cookie_policy: 'https://cartodb-staging.com' github: @@ -368,11 +389,24 @@ defaults: &defaults datasources: arcgis_enabled: false salesforce_enabled: false - basemaps: + basemaps: # Adding `default: true` at a basemap marks its group as the default one. Its first basemap becomes the default one. CARTO: - positron_rainbow_labels: + voyager_labels: default: true - url: 'http://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png' + urlTemplate: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_nolabels/{z}/{x}/{y}.png' + urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_nolabels/{z}/{x}/{y}@2x.png' + subdomains: 'abcd' + minZoom: '0' + maxZoom: '18' + name: 'Voyager' + className: 'voyager_labels' + attribution: '© OpenStreetMap contributors © CARTO' + labels: + urlTemplate: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_only_labels/{z}/{x}/{y}.png' + urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_only_labels/{z}/{x}/{y}@2x.png' + positron_rainbow_labels: + urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png' + urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}@2x.png' subdomains: 'abcd' minZoom: '0' maxZoom: '18' @@ -380,9 +414,11 @@ defaults: &defaults className: 'positron_rainbow_labels' attribution: '© OpenStreetMap contributors © CARTO' labels: - url: 'http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png' + urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png' + urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}@2x.png' dark_matter_rainbow_labels: - url: 'http://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png' + urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png' + urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}@2x.png' subdomains: 'abcd' minZoom: '0' maxZoom: '18' @@ -390,9 +426,20 @@ defaults: &defaults className: 'dark_matter_rainbow_labels' attribution: '© OpenStreetMap contributors © CARTO' labels: - url: 'http://{s}.basemaps.cartocdn.com/dark_only_labels/{z}/{x}/{y}.png' + urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_only_labels/{z}/{x}/{y}.png' + urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_only_labels/{z}/{x}/{y}@2x.png' + voyager: + urlTemplate: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_labels_under/{z}/{x}/{y}.png' + urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_labels_under/{z}/{x}/{y}@2x.png' + subdomains: 'abcd' + minZoom: '0' + maxZoom: '18' + name: 'Voyager (labels below)' + className: 'voyager' + attribution: '© OpenStreetMap contributors © CARTO' positron_rainbow: - url: 'http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png' + urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png' + urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}@2x.png' subdomains: 'abcd' minZoom: '0' maxZoom: '18' @@ -400,15 +447,26 @@ defaults: &defaults className: 'positron_rainbow' attribution: '© OpenStreetMap contributors © CARTO' dark_matter_rainbow: - url: 'http://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png' + urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png' + urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png' subdomains: 'abcd' minZoom: '0' maxZoom: '18' name: 'Dark matter (labels below)' className: 'dark_matter_rainbow' attribution: '© OpenStreetMap contributors © CARTO' + voyager_lite: + urlTemplate: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_nolabels/{z}/{x}/{y}.png' + urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_nolabels/{z}/{x}/{y}@2x.png' + subdomains: 'abcd' + minZoom: '0' + maxZoom: '18' + name: 'Voyager (lite)' + className: 'voyager_lite' + attribution: '© OpenStreetMap contributors © CARTO' positron_lite_rainbow: - url: 'http://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png' + urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png' + urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}@2x.png' subdomains: 'abcd' minZoom: '0' maxZoom: '18' @@ -416,7 +474,8 @@ defaults: &defaults className: 'positron_lite_rainbow' attribution: '© OpenStreetMap contributors © CARTO' dark_matter_lite_rainbow: - url: 'http://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png' + urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png' + urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}@2x.png' subdomains: 'abcd' minZoom: '0' maxZoom: '18' @@ -424,7 +483,7 @@ defaults: &defaults className: 'dark_matter_lite_rainbow' attribution: '© OpenStreetMap contributors © CARTO' eco_cartodb: - url: 'https://cartocdn_{s}.global.ssl.fastly.net/base-antique/{z}/{x}/{y}.png' + urlTemplate: 'https://cartocdn_{s}.global.ssl.fastly.net/base-eco/{z}/{x}/{y}.png' subdomains: 'abcd' minZoom: '0' maxZoom: '10' @@ -432,7 +491,7 @@ defaults: &defaults className: 'eco_cartodb' attribution: '' flat_blue: - url: 'https://cartocdn_{s}.global.ssl.fastly.net/base-flatblue/{z}/{x}/{y}.png' + urlTemplate: 'https://cartocdn_{s}.global.ssl.fastly.net/base-flatblue/{z}/{x}/{y}.png' subdomains: 'abcd' minZoom: '0' maxZoom: '10' @@ -440,7 +499,7 @@ defaults: &defaults className: 'flat_blue' attribution: '' midnight_cartodb: - url: 'https://cartocdn_{s}.global.ssl.fastly.net/base-midnight/{z}/{x}/{y}.png' + urlTemplate: 'https://cartocdn_{s}.global.ssl.fastly.net/base-midnight/{z}/{x}/{y}.png' subdomains: 'abcd' minZoom: '0' maxZoom: '10' @@ -448,7 +507,7 @@ defaults: &defaults className: 'midnight_cartodb' attribution: '' antique_cartodb: - url: 'https://cartocdn_{s}.global.ssl.fastly.net/base-antique/{z}/{x}/{y}.png' + urlTemplate: 'https://cartocdn_{s}.global.ssl.fastly.net/base-antique/{z}/{x}/{y}.png' subdomains: 'abcd' minZoom: 0 maxZoom: 10 @@ -457,7 +516,7 @@ defaults: &defaults attribution: '' Stamen: toner_stamen_labels: - url: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner-background/{z}/{x}/{y}.png' + urlTemplate: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner-background/{z}/{x}/{y}.png' subdomains: 'abcd' minZoom: '0' maxZoom: '18' @@ -465,9 +524,9 @@ defaults: &defaults className: 'toner_stamen_labels' attribution: 'Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL.' labels: - url: 'http://{s}.tile.stamen.com/toner-labels/{z}/{x}/{y}.png' + urlTemplate: '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' + urlTemplate: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner/{z}/{x}/{y}.png' subdomains: 'abcd' minZoom: '0' maxZoom: '18' @@ -475,7 +534,7 @@ defaults: &defaults className: 'toner_stamen' attribution: 'Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL.' toner_background_stamen: - url: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner-background/{z}/{x}/{y}.png' + urlTemplate: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner-background/{z}/{x}/{y}.png' subdomains: 'abcd' minZoom: '0' maxZoom: '18' @@ -483,7 +542,7 @@ defaults: &defaults className: 'toner_background_stamen' attribution: 'Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL.' toner_lite_stamen: - url: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner-lite/{z}/{x}/{y}.png' + urlTemplate: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner-lite/{z}/{x}/{y}.png' subdomains: 'abcd' minZoom: '0' maxZoom: '18' @@ -491,7 +550,7 @@ defaults: &defaults className: 'toner_lite_stamen' attribution: 'Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL.' toner_lines_stamen: - url: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner-lines/{z}/{x}/{y}.png' + urlTemplate: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner-lines/{z}/{x}/{y}.png' subdomains: 'abcd' minZoom: '0' maxZoom: '18' @@ -499,7 +558,7 @@ defaults: &defaults className: 'toner_lines_stamen' attribution: 'Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL.' toner_hybrid_stamen: - url: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner-hybrid/{z}/{x}/{y}.png' + urlTemplate: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner-hybrid/{z}/{x}/{y}.png' subdomains: 'abcd' minZoom: '0' maxZoom: '18' @@ -507,7 +566,7 @@ defaults: &defaults className: 'toner_hybrid_stamen' attribution: 'Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL.' watercolor_stamen: - url: 'https://stamen-tiles-{s}.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.png' + urlTemplate: 'https://stamen-tiles-{s}.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.png' subdomains: 'abcd' minZoom: '0' maxZoom: '18' @@ -534,6 +593,7 @@ defaults: &defaults sqlserver: enabled: false max_rows: 500000 + enforce_non_empty_layer_css: false dataservices: enabled: geocoder_internal: true