cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add server_protocol configuration option

Browse source
This commit is contained in:
Tom Hughes 2017-03-22 18:22:24 +00:00
parent 24271b75bd
commit bf8959cdc2
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config/example.application.yml
View file

@ -1,6 +1,7 @@
defaults: &defaults defaults: &defaults
# The server URL # The server protocol and host
#server_url: "www.openstreetmap.org" server_protocol: "http"
server_url: "openstreetmap.example.com"
# The generator # The generator
generator: "OpenStreetMap server" generator: "OpenStreetMap server"
copyright_owner: "OpenStreetMap and contributors" copyright_owner: "OpenStreetMap and contributors"
@ -130,8 +131,6 @@ production:
test: test:
<<: *defaults <<: *defaults
# Server URL for testing
server_url: "openstreetmap.example.com"
# Geonames credentials for testing # Geonames credentials for testing
geonames_username: "dummy" geonames_username: "dummy"
# External authentication credentials for testing # External authentication credentials for testing

2
config/initializers/canonical_rails.rb
View file

@ -1,7 +1,7 @@
CanonicalRails.setup do |config| CanonicalRails.setup do |config|
# Force the protocol. If you do not specify, the protocol will be based on the incoming request's protocol. # Force the protocol. If you do not specify, the protocol will be based on the incoming request's protocol.
# config.protocol#= 'https://' config.protocol = "#{SERVER_PROTOCOL}://"
# This is the main host, not just the TLD, omit slashes and protocol. If you have more than one, pick the one you want to rank in search results. # This is the main host, not just the TLD, omit slashes and protocol. If you have more than one, pick the one you want to rank in search results.