Fix contrib doc to remove reference to travis

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 4f267e5d0c9838d31e04141b2830a053c826c95d..801e8f2d1328045a0629870cd385aaf4afbc526a 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -16,13 +16,13 @@ email_return_path: "openstreetmap@example.com"
 # API version
 api_version: "0.6"
 # Application status - possible values are:
 # API version
 api_version: "0.6"
 # Application status - possible values are:

-#   :online - online and operating normally
-#   :api_readonly - site online but API in read-only mode
-#   :api_offline - site online but API offline
-#   :database_readonly - database and site in read-only mode
-#   :database_offline - database offline with site in emergency mode
-#   :gpx_offline - gpx storage offline
-status: :online
+#   online - online and operating normally
+#   api_readonly - site online but API in read-only mode
+#   api_offline - site online but API offline
+#   database_readonly - database and site in read-only mode
+#   database_offline - database offline with site in emergency mode
+#   gpx_offline - gpx storage offline
+status: "online"

 # The maximum area you're allowed to request, in square degrees
 max_request_area: 0.25
 # Number of GPS trace/trackpoints returned per-page
 # The maximum area you're allowed to request, in square degrees
 max_request_area: 0.25
 # Number of GPS trace/trackpoints returned per-page


@@ -42,27 +42,27 @@ api_timeout: 300
 # Timeout for web pages in seconds
 web_timeout: 30
 # Periods (in hours) which are allowed for user blocks
 # Timeout for web pages in seconds
 web_timeout: 30
 # Periods (in hours) which are allowed for user blocks

-user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96]
+user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96, 168, 336, 731, 4383, 8766, 87660]

 # Rate limit for message sending
 max_messages_per_hour: 60
 # Rate limit for message sending
 max_messages_per_hour: 60

+# Rate limit for friending
+max_friends_per_hour: 60

 # Domain for handling message replies
 #messages_domain: "messages.openstreetmap.org"
 # Geonames authentication details
 #geonames_username: ""
 # Domain for handling message replies
 #messages_domain: "messages.openstreetmap.org"
 # Geonames authentication details
 #geonames_username: ""

-# GeoIP database
-#geoip_database: ""
+# MaxMind GeoIPv2 database
+#maxmind_database: ""

 # Users to show as being nearby
 nearby_users: 30
 # Max radius, in km, for nearby users
 nearby_radius: 50
 # Spam threshold
 spam_threshold: 50
 # Users to show as being nearby
 nearby_users: 30
 # Max radius, in km, for nearby users
 nearby_radius: 50
 # Spam threshold
 spam_threshold: 50

+# Delay diary entries from appearing in the feed for this many hours
+diary_feed_delay: 0

 # Default legale (jurisdiction location) for contributor terms
 default_legale: GB
 # Default legale (jurisdiction location) for contributor terms
 default_legale: GB

-# Use the built-in jobs queue for importing traces
-# Leave as false if you are using the external high-speed gpx importer
-# https://github.com/openstreetmap/gpx-import
-trace_use_job_queue: false

 # Location of GPX traces and images
 gpx_trace_dir: "/home/osm/traces"
 gpx_image_dir: "/home/osm/images"
 # Location of GPX traces and images
 gpx_trace_dir: "/home/osm/traces"
 gpx_image_dir: "/home/osm/images"


@@ -80,10 +80,8 @@ oauth_10_support: true
 nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor
 default_editor: "id"
 nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor
 default_editor: "id"

-# OAuth consumer key for Potlatch 2
-#potlatch2_key: ""
-# OAuth consumer key for the web site
-#oauth_key: ""
+# OAuth application for the web site
+#oauth_application: ""

 # OAuth consumer key for iD
 #id_key: ""
 # Imagery to return in capabilities as blacklisted
 # OAuth consumer key for iD
 #id_key: ""
 # Imagery to return in capabilities as blacklisted


@@ -120,3 +118,17 @@ fossgis_osrm_url: "https://routing.openstreetmap.de/"
 csp_enforce: false
 # URL for reporting Content-Security-Policy violations
 #csp_report_url: ""
 csp_enforce: false
 # URL for reporting Content-Security-Policy violations
 #csp_report_url: ""

+# Storage service to use in production mode
+storage_service: "local"
+# Root URL for storage service
+# storage_url:
+# URL for tile CDN
+#tile_cdn_url: ""
+# SMTP settings for outbound mail
+smtp_address: "localhost"
+smtp_port: 25
+smtp_domain: "localhost"
+smtp_enable_starttls_auto: false
+smtp_authentication: null
+smtp_user_name: null
+smtp_password: null