Return settings.yml to upstream state, requiring all local (OHM) mods…

… to be in settings.local.yml as they should be.

config/settings.yml

@@ -1,19 +1,18 @@
 # The server protocol and host
 server_protocol: "http"
-server_url: "openhistoricalmap.example.com"
-embed_server_url: "https://embed.openhistoricalmap.org/"
+server_url: "openstreetmap.example.com"
 # Publisher
 #publisher_url: ""
 # The generator
-generator: "OpenHistoricalMap server"
-copyright_owner: "OpenHistoricalMap and contributors"
-attribution_url: "http://www.openhistoricalmap.org/copyright"
+generator: "OpenStreetMap server"
+copyright_owner: "OpenStreetMap and contributors"
+attribution_url: "http://www.openstreetmap.org/copyright"
 license_url: "http://opendatacommons.org/licenses/odbl/1-0/"
 # Support email address
-support_email: "ohm-admins@googlegroups.com"
+support_email: "openstreetmap@example.com"
 # Sender addresses for emails
-email_from: "OpenHistoricalMap <>"
-email_return_path: ""
+email_from: "OpenStreetMap <[email protected]>"
+email_return_path: "[email protected]"
 # API version
 api_version: "0.6"
 # Application status - possible values are:
@@ -51,9 +50,9 @@ max_trace_size: 1000000
 # Zoom level to use for postcode results from the geocoder
 postcode_zoom: 15
 # Timeout for API calls in seconds
-api_timeout: 600
+api_timeout: 300
 # Timeout for web pages in seconds
-web_timeout: 600
+web_timeout: 30
 # Periods (in hours) which are allowed for user blocks
 user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96, 168, 336, 731, 4383, 8766, 87660]
 # Account deletion cooldown period (in hours) since last changeset close; null to disable, 0 to make sure there aren't any open changesets when the deletion happens
@@ -109,22 +108,15 @@ attachments_dir: ":rails_root/public/attachments"
 # List of memcache servers to use for caching
 #memcache_servers: []
 # URL of Nominatim instance to use for geocoding
-nominatim_url: "https://nominatim.openhistoricalmap.org/"
+nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor
 default_editor: "id"
 # OAuth application for the web site
-# oauth_application: "OAUTH_CLIENT_ID"
-# oauth_key: "OAUTH_KEY"
-# OAuth consumer key for iD
+#oauth_application: ""
+# OAuth application for iD
 #id_application: ""
 # Imagery to return in capabilities as blacklisted
-imagery_blacklist:
-  # Current Google imagery URLs have google or googleapis in the domain
-  - ".*\\.google(apis)?\\..*/.*"
-  # Blacklist VWorld
-  - "http://xdworld\\.vworld\\.kr:8080/.*"
-  # Blacklist here
-  - ".*\\.here\\.com[/:].*"
+imagery_blacklist: []
 # URL of Overpass instance to use for feature queries
 overpass_url: "https://overpass-api.de/api/interpreter"
 overpass_credentials: false
@@ -150,8 +142,6 @@ fossgis_valhalla_url: "https://valhalla1.openstreetmap.de/route"
 #tracestrack_key: ""
 # Key for generating TOTP tokens
 #totp_key: ""
-# Mastodon url for verification
-mastodon_url: "https://mapstodon.space/@ohm"
 # Enforce Content-Security-Policy
 csp_enforce: false
 # URL for reporting Content-Security-Policy violations
@@ -168,14 +158,14 @@ trace_icon_storage: "local"
 # URL for tile CDN
 #tile_cdn_url: ""
 # SMTP settings for outbound mail
-smtp_address: ""
-smtp_port:
-smtp_domain: ""
+smtp_address: "localhost"
+smtp_port: 25
+smtp_domain: "localhost"
 smtp_enable_starttls_auto: true
 smtp_tls_verify_mode: "none"
-smtp_authentication: "login"
-smtp_user_name: ""
-smtp_password: ""
+smtp_authentication: null
+smtp_user_name: null
+smtp_password: null
 # Matomo settings for analytics
 #matomo:
 # Signup rate limits