projects
/
chef.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
29be45d
)
Redirect https requests to osm.org to www.osm.org
author
Tom Hughes
<tom@compton.nu>
Tue, 11 Feb 2014 13:53:44 +0000
(13:53 +0000)
committer
Tom Hughes
<tom@compton.nu>
Tue, 11 Feb 2014 13:53:44 +0000
(13:53 +0000)
cookbooks/web/templates/default/apache.frontend.erb
patch
|
blob
|
history
diff --git
a/cookbooks/web/templates/default/apache.frontend.erb
b/cookbooks/web/templates/default/apache.frontend.erb
index 206d54c07f63adf14968e5154c6a2d51f8916b73..8effc61e58c2fa548036b185b59cb1bb272683c4 100644
(file)
--- a/
cookbooks/web/templates/default/apache.frontend.erb
+++ b/
cookbooks/web/templates/default/apache.frontend.erb
@@
-282,6
+282,15
@@
RedirectPermanent / http://www.openstreetmap.org/
</VirtualHost>
+<VirtualHost *:443>
+ ServerName openstreetmap.org
+ ServerAlias maps.openstreetmap.org mapz.openstreetmap.org
+
+ SSLEngine on
+
+ RedirectPermanent / https://www.openstreetmap.org/
+</VirtualHost>
+
<VirtualHost *:80>
ServerName openstreetmap.org.uk
ServerAlias www.openstreetmap.org.uk