-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #444 from OpenHistoricalMap/ohm-website-new-settin…
…gs-after-force-push Update settings file in advance of upstream merge.
- Loading branch information
Showing
3 changed files
with
106 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,29 @@ | ||
| # The server protocol and host | ||
| server_protocol: "http" | ||
| server_url: "openhistoricalmap.example.com" | ||
| # Publisher | ||
| #publisher_url: "" | ||
| # The generator | ||
| 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" | ||
| license_url: "http://opendatacommons.org/licenses/odbl/1-0/" | ||
| # Support email address | ||
| support_email: "[email protected]" | ||
| # Sender addresses for emails | ||
| email_from: "OpenHistoricalMap <[email protected]>" | ||
| email_return_path: "[email protected]" | ||
| # OAuth application for the web site | ||
| oauth_application: "OAUTH_CLIENT_ID" | ||
| oauth_key: "OAUTH_KEY" | ||
| status: "api_readonly" | ||
| max_number_of_nodes: 100000 | ||
| api_timeout: 600 | ||
| web_timeout: 600 | ||
| #memcache_servers: [] | ||
| nominatim_url: "https://nominatim.openhistoricalmap.org/" | ||
| # OAuth application for the website | ||
| oauth_application: "" | ||
| oauth_key: "" | ||
| # OAuth consumer key for iD | ||
| id_application: "" | ||
| # List of memcache servers to use for caching | ||
| memcache_servers: [] | ||
| # URL of Nominatim instance to use for geocoding | ||
| nominatim_url: "https://nominatim.openhistoricalmap.org/" | ||
| # URL of Overpass instance to use for feature queries | ||
| overpass_url: "https://overpass-api.de/api/interpreter" | ||
| # SMTP settings for outbound mail | ||
| smtp_address: "localhost" | ||
| smtp_port: 25 | ||
| smtp_domain: "localhost" | ||
| smtp_enable_starttls_auto: true | ||
| smtp_tls_verify_mode: "none" | ||
| smtp_authentication: null | ||
| smtp_user_name: null | ||
| smtp_password: null | ||
| doorkeeper_signing_key: | | ||
| -----BEGIN PRIVATE KEY----- | ||
| PRIVATE_KEY | ||
| -----END PRIVATE KEY----- | ||
| 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[/:].*" | ||
| overpass_url: "https://overpass-api.openhistoricalmap.org/api/interpreter" | ||
| # Mastodon url for verification | ||
| mastodon_url: "https://mapstodon.space/@ohm" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,40 +14,35 @@ production: | |
| encoding: utf8" >$workdir/config/database.yml | ||
|
|
||
| #### Setting up server_url and server_protocol | ||
| sed -i -e 's/server_url: "openhistoricalmap.example.com"/server_url: "'$SERVER_URL'"/g' $workdir/config/settings.local.yml | ||
| sed -i -e 's/server_protocol: "http"/server_protocol: "'$SERVER_PROTOCOL'"/g' $workdir/config/settings.local.yml | ||
| sed -i -e 's/^server_protocol: "http"/server_protocol: "'$SERVER_PROTOCOL'"/g' $workdir/config/settings.yml | ||
| sed -i -e 's/^server_url: ".*"/server_url: "'$SERVER_URL'"/g' $workdir/config/settings.local.yml | ||
|
|
||
| ### Setting up website status | ||
| sed -i "s/online/$WEBSITE_STATUS/g" $workdir/config/settings.yml | ||
|
|
||
| #### Setting up mail sender | ||
| sed -i -e 's/smtp_address: "localhost"/smtp_address: "'$MAILER_ADDRESS'"/g' $workdir/config/settings.local.yml | ||
| sed -i -e 's/smtp_domain: "localhost"/smtp_domain: "'$MAILER_DOMAIN'"/g' $workdir/config/settings.local.yml | ||
| sed -i -e 's/smtp_enable_starttls_auto: false/smtp_enable_starttls_auto: true/g' $workdir/config/settings.local.yml | ||
| sed -i -e 's/smtp_authentication: null/smtp_authentication: "login"/g' $workdir/config/settings.local.yml | ||
| sed -i -e 's/smtp_user_name: null/smtp_user_name: "'$MAILER_USERNAME'"/g' $workdir/config/settings.local.yml | ||
| sed -i -e 's/smtp_password: null/smtp_password: "'$MAILER_PASSWORD'"/g' $workdir/config/settings.local.yml | ||
| sed -i -e 's/[email protected]/'$MAILER_FROM'/g' $workdir/config/settings.local.yml | ||
| sed -i -e 's/smtp_port: 25/smtp_port: '$MAILER_PORT'/g' $workdir/config/settings.local.yml | ||
|
|
||
| #### Setting up id key fro the website | ||
| sed -i -e 's/id_application: ""/id_application: "'$OPENSTREETMAP_id_key'"/g' $workdir/config/settings.local.yml | ||
| sed -i -e 's/#id_application: ""/id_application: "'$OPENSTREETMAP_id_key'"/g' $workdir/config/settings.yml | ||
|
|
||
| #### Setting up oauth id and key for iD editor | ||
| sed -i -e 's/OAUTH_CLIENT_ID/'$OAUTH_CLIENT_ID'/g' $workdir/config/settings.local.yml | ||
| sed -i -e 's/OAUTH_KEY/'$OAUTH_KEY'/g' $workdir/config/settings.local.yml | ||
| sed -i -e 's/# oauth_application: "OAUTH_CLIENT_ID"/oauth_application: "'$OAUTH_CLIENT_ID'"/g' $workdir/config/settings.yml | ||
| sed -i -e 's/# oauth_key: "OAUTH_CLIENT_ID"/oauth_key: "'$OAUTH_KEY'"/g' $workdir/config/settings.yml | ||
| sed -i -e 's/smtp_address: "localhost"/smtp_address: "'$MAILER_ADDRESS'"/g' $workdir/config/settings.yml | ||
| sed -i -e 's/smtp_port: 25/smtp_port: '$MAILER_PORT'/g' $workdir/config/settings.yml | ||
| sed -i -e 's/smtp_domain: "localhost"/smtp_domain: "'$MAILER_DOMAIN'"/g' $workdir/config/settings.yml | ||
| sed -i -e 's/smtp_authentication: null/smtp_authentication: "login"/g' $workdir/config/settings.yml | ||
| sed -i -e 's/smtp_user_name: null/smtp_user_name: "'$MAILER_USERNAME'"/g' $workdir/config/settings.yml | ||
| sed -i -e 's/smtp_password: null/smtp_password: "'$MAILER_PASSWORD'"/g' $workdir/config/settings.yml | ||
|
|
||
| ### Setting up oauth id and key for iD editor | ||
| sed -i -e 's/^oauth_application: ".*"/oauth_application: "'$OAUTH_CLIENT_ID'"/g' $workdir/config/settings.local.yml | ||
| sed -i -e 's/^oauth_key: ".*"/oauth_key: "'$OAUTH_KEY'"/g' $workdir/config/settings.local.yml | ||
|
|
||
| #### Setting up id key for the website | ||
| sed -i -e 's/^id_application: ".*"/id_application: "'$OPENSTREETMAP_id_key'"/g' $workdir/config/settings.local.yml | ||
|
|
||
| #### Setup env vars for memcached server | ||
| sed -i -e 's/memcache_servers: \[\]/memcache_servers: "'$OPENSTREETMAP_memcache_servers'"/g' $workdir/config/settings.local.yml | ||
| sed -i -e 's/#memcache_servers: \[\]/memcache_servers: "'$OPENSTREETMAP_memcache_servers'"/g' $workdir/config/settings.local.yml | ||
|
|
||
| #### Setting up nominatim url | ||
| sed -i -e 's/nominatim.openhistoricalmap.org/'$NOMINATIM_URL'/g' $workdir/config/settings.local.yml | ||
|
|
||
| #### Setting up overpass url | ||
| sed -i -e 's/overpass-api.de/'$OVERPASS_URL'/g' $workdir/config/settings.local.yml | ||
| ## Setting up overpass url | ||
| sed -i -e 's/overpass-api.openhistoricalmap.org/'$OVERPASS_URL'/g' $workdir/config/settings.local.yml | ||
| sed -i -e 's/overpass-api.de/'$OVERPASS_URL'/g' $workdir/app/views/site/export.html.erb | ||
| sed -i -e 's/overpass-api.de/'$OVERPASS_URL'/g' $workdir/app/assets/javascripts/index/export.js | ||
|
|
||
|
|
||