From: Tom Hughes <tom@compton.nu>
Date: Tue, 7 Jul 2015 20:25:04 +0000 (+0100)
Subject: Move crm.osmfoundation to join.osmfoundation
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/dcef513a0de7f7ac7938d6a605b1bfaea432e8a3?ds=inline

Move crm.osmfoundation to join.osmfoundation
---

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 5fb9c5eeb..54baedbf3 100644
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -35,7 +35,8 @@ mysql_database "civicrm" do
   permissions "civicrm@localhost" => :all
 end
 
-wordpress_site "crm.osmfoundation.org" do
+wordpress_site "join.osmfoundation.org" do
+  aliases "crm.osmfoundation.org"
   ssl_enabled true
   database_name "civicrm"
   database_user "civicrm"
@@ -43,16 +44,16 @@ wordpress_site "crm.osmfoundation.org" do
 end
 
 wordpress_theme "osmblog-wp-theme" do
-  site "crm.osmfoundation.org"
+  site "join.osmfoundation.org"
   repository "git://github.com/harry-wood/osmblog-wp-theme.git"
 end
 
 wordpress_plugin "registration-honeypot" do
-  site "crm.osmfoundation.org"
+  site "join.osmfoundation.org"
 end
 
 civicrm_version = node[:civicrm][:version]
-civicrm_directory = "/srv/crm.osmfoundation.org/wp-content/plugins/civicrm"
+civicrm_directory = "/srv/join.osmfoundation.org/wp-content/plugins/civicrm"
 
 directory "/opt/civicrm-#{civicrm_version}" do
   owner "wordpress"
@@ -105,7 +106,7 @@ execute "/opt/civicrm-#{civicrm_version}/civicrm" do
   subscribes :run, "execute[/var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz]", :immediately
 end
 
-directory "/srv/crm.osmfoundation.org/wp-content/plugins/files" do
+directory "/srv/join.osmfoundation.org/wp-content/plugins/files" do
   owner "www-data"
   group "www-data"
   mode 0755
@@ -122,8 +123,8 @@ settings = edit_file "#{civicrm_directory}/civicrm/templates/CRM/common/civicrm.
   line.gsub!(/%%dbHost%%/, "localhost")
   line.gsub!(/%%dbName%%/, "civicrm")
   line.gsub!(/%%crmRoot%%/, "#{civicrm_directory}/civicrm/")
-  line.gsub!(/%%templateCompileDir%%/, "/srv/crm.osmfoundation.org/wp-content/plugins/files/civicrm/templates_c/")
-  line.gsub!(/%%baseURL%%/, "http://crm.osmfoundation.org/")
+  line.gsub!(/%%templateCompileDir%%/, "/srv/join.osmfoundation.org/wp-content/plugins/files/civicrm/templates_c/")
+  line.gsub!(/%%baseURL%%/, "http://join.osmfoundation.org/")
   line.gsub!(/%%siteKey%%/, site_key)
 
   line
diff --git a/cookbooks/civicrm/templates/default/backup.cron.erb b/cookbooks/civicrm/templates/default/backup.cron.erb
index 83421ff0f..9a2155616 100644
--- a/cookbooks/civicrm/templates/default/backup.cron.erb
+++ b/cookbooks/civicrm/templates/default/backup.cron.erb
@@ -8,7 +8,7 @@ B=osmf-crm-$D.tar.gz
 
 mkdir $T/osmf-crm-$D
 mysqldump --user=civicrm --password=<%= @passwords["database"] %> --opt --skip-lock-tables civicrm > $T/osmf-crm-$D/civicrm.sql
-ln -s /srv/crm.osmfoundation.org $T/osmf-crm-$D/www
+ln -s /srv/join.osmfoundation.org $T/osmf-crm-$D/www
 
 export GZIP="--rsyncable -9"
 export RSYNC_RSH="ssh -ax -c arcfour"
diff --git a/cookbooks/civicrm/templates/default/cron.erb b/cookbooks/civicrm/templates/default/cron.erb
index 3a8113845..44d13b408 100644
--- a/cookbooks/civicrm/templates/default/cron.erb
+++ b/cookbooks/civicrm/templates/default/cron.erb
@@ -2,4 +2,4 @@
 
 MAILTO=jonobennett+civicrm@gmail.com
 
-*/15 * * * * www-data php <%= @directory %>/civicrm/bin/cli.php -s crm.osmfoundation.org -u batch -p "<%= @passwords["batch"] %>" -e Job -a execute
+*/15 * * * * www-data php <%= @directory %>/civicrm/bin/cli.php -s join.osmfoundation.org -u batch -p "<%= @passwords["batch"] %>" -e Job -a execute
diff --git a/roles/crm.rb b/roles/crm.rb
index ec4715232..b5675b0de 100644
--- a/roles/crm.rb
+++ b/roles/crm.rb
@@ -3,19 +3,19 @@ description "Role applied to CRM server"
 
 default_attributes(
   :exim => {
-    :local_domains => ["crm.osmfoundation.org"],
+    :local_domains => ["join.osmfoundation.org"],
     :routes => {
-      :crm_return => {
-        :comment => "return@crm.osmfoundation.org",
-        :domains => ["crm.osmfoundation.org"],
+      :join_return => {
+        :comment => "return@join.osmfoundation.org",
+        :domains => ["join.osmfoundation.org"],
         :local_parts => ["return"],
         :maildir => "/var/mail/crm-return",
         :user => "www-data",
         :group => "mail"
       },
-      :crm_mail => {
-        :comment => "mail@crm.osmfoundation.org",
-        :domains => ["crm.osmfoundation.org"],
+      :join_mail => {
+        :comment => "mail@join.osmfoundation.org",
+        :domains => ["join.osmfoundation.org"],
         :local_parts => ["mail"],
         :maildir => "/var/mail/crm-mail",
         :user => "www-data",
diff --git a/roles/mail.rb b/roles/mail.rb
index d4cb37518..cb81cb360 100644
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -35,9 +35,9 @@ default_attributes(
         :domains => ["tickets.openstreetmap.org"],
         :host => "ridley.ucl.openstreetmap.org"
       },
-      :crm => {
-        :comment => "crm.osmfoundation.org",
-        :domains => ["crm.osmfoundation.org"],
+      :join => {
+        :comment => "join.osmfoundation.org",
+        :domains => ["join.osmfoundation.org"],
         :host => "ridley.ucl.openstreetmap.org"
       }
     },