Merge join and donate redirectors into supporting

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index c153c373ffff61da1f2d8cd33bc840b59f61c740..557e8b736d1dcd6ef7a973709aff5954aef414d5 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -49,21 +49,20 @@ mysql_database "civicrm" do
   permissions "civicrm@localhost" => :all
 end
 
   permissions "civicrm@localhost" => :all
 end
 

-ssl_certificate "join.osmfoundation.org" do
-  domains [ "join.osmfoundation.org", "crm.osmfoundation.org",
-            "supporting.osmfoundation.org", "support.osmfoundation.org",
-            "support.openstreetmap.org", "supporting.osm.org",
-            "support.osm.org"]
-  notifies :reload, "service[apache2]"
-end
-
-apache_site "join.osmfoundation.org" do
-  template "apache.erb"
-end
-

 wordpress_site "supporting.openstreetmap.org" do
 wordpress_site "supporting.openstreetmap.org" do

-  # Do not add aliases these can causes issues with civicrm PHP sessions
-  # Use redirects instead
+  aliases %w[
+    crm.osmfoundation.org
+    donate.openstreetmap.org
+    donate.openstreetmap.com
+    donate.openstreetmap.net
+    donate.osm.org
+    join.osmfoundation.org
+    supporting.osmfoundation.org
+    support.osmfoundation.org
+    support.openstreetmap.org
+    supporting.osm.org
+    support.osm.org
+  ]

   database_name "civicrm"
   database_user "civicrm"
   database_password database_password
   database_name "civicrm"
   database_user "civicrm"
   database_password database_password

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 7a653f422be9eb0e63fc8a42f1dffe3acd8027f8..b1b1e1e13d1ee1af22cd3033eb74f2b88365f4e9 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -44,7 +44,6 @@ run_list(
   "role[stateofthemap]",
   "role[blog]",
   "role[otrs]",
   "role[stateofthemap]",
   "role[blog]",
   "role[otrs]",

-  "role[donate]",

   "recipe[dmca]",
   "recipe[dhcpd]"
 )
   "recipe[dmca]",
   "recipe[dhcpd]"
 )