Hopefully the final commit for these files. My choices try to address…

… two pressures.

It is easier to track upstream changes to openstreetmap-website when there's less potential for
merge conflicts. settings.yml is now identical to upstream and all OHM modifications are
made in settings.local.yml; that file is not checked in to source control but a fleshed-out
skeleton is available at example.settings.local.yml. What information is in there is publicly
available with the exception of OAuth IDs, and those are generated per installation.

These two files should be identical to those in images/web/config/ of the ohm-deploy repo and
they are manipulated by the start.sh script in the parent directory. Those scripts have been
modified so that they use the proper settings file for variable substitution.

config/example.settings.local.yml

@@ -1,11 +1,31 @@
-# Local overrides and secrets
+# OHM overrides and secrets
 # These settings are for local, Docker-based development
 # OAuth keys are generated at installation time; see CONFIGURE.md
-server_url: "0.0.0.0:3000" 
+server_url: "0.0.0.0:3000"
+embed_server_url: "https://embed.openhistoricalmap.org/"
+generator: "OpenHistoricalMap server"
+copyright_owner: "OpenHistoricalMap and contributors"
+attribution_url: "http://www.openhistoricalmap.org/copyright"
+support_email: "[email protected]"
+email_from: "OpenHistoricalMap <[email protected]>"
+email_return_path: "[email protected]"
 api_timeout: 600
 web_timeout: 600
-# OAuth application for the web site
+nominatim_url: "https://nominatim.openhistoricalmap.org/"
+# OAuth application for the website
 oauth_application: ""
 oauth_key: ""
 # OAuth consumer key for iD
 id_application: ""
+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[/:].*"
+# Mastodon url for verification
+mastodon_url: "https://mapstodon.space/@ohm"
+smtp_authentication: null
+smtp_user_name: null
+smtp_password: null

config/settings.yml

@@ -1,19 +1,18 @@
 # The server protocol and host
 server_protocol: "http"
 server_url: "openstreetmap.example.com"
-embed_server_url: "https://embed.openhistoricalmap.org/"
 # 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 <ohm-admins@googlegroups.com>"
-email_return_path: "ohm-admins@googlegroups.com"
+email_from: "OpenStreetMap <openstreetmap@example.com>"
+email_return_path: "openstreetmap@example.com"
 # API version
 api_version: "0.6"
 # Application status - possible values are:
@@ -109,21 +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 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
@@ -149,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
@@ -172,9 +163,9 @@ 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