X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5919a0168e927c655ce23acc885413864f0ebfcf..d9f126925e7ea9bd78363d9e9a99f039f822a90d:/cookbooks/civicrm/recipes/default.rb

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 382cb53b4..54baedbf3 100644
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -17,8 +17,6 @@
 # limitations under the License.
 #
 
-node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ "crm.osmfoundation" ]
-
 include_recipe "wordpress"
 include_recipe "mysql"
 
@@ -27,7 +25,6 @@ package "wkhtmltopdf"
 passwords = data_bag_item("civicrm", "passwords")
 
 database_password = passwords["database"]
-admin_password = passwords["admin"]
 site_key = passwords["key"]
 
 mysql_user "civicrm@localhost" do
@@ -38,21 +35,25 @@ 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
-  ssl_certificate "crm.osmfoundation"
   database_name "civicrm"
   database_user "civicrm"
   database_password database_password
 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 "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