Make default mw file extensions a blank array

[chef.git] / cookbooks / civicrm / recipes / default.rb

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 7865752e36edc591c8948905e5ec1837b8d79b7a..54baedbf380ed1d572c7e4d0b67064fc62c160c1 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -17,8 +17,6 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-node.default[:ssl][:certificates] = node[:ssl][:certificates] | ["crm.osmfoundation"]
-

 include_recipe "wordpress"
 include_recipe "mysql"
 
 include_recipe "wordpress"
 include_recipe "mysql"
 


@@ -37,21 +35,25 @@ mysql_database "civicrm" do
   permissions "civicrm@localhost" => :all
 end
 
   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_enabled true

-  ssl_certificate "crm.osmfoundation"

   database_name "civicrm"
   database_user "civicrm"
   database_password database_password
 end
 
 wordpress_theme "osmblog-wp-theme" do
   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
 
   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_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"
 
 directory "/opt/civicrm-#{civicrm_version}" do
   owner "wordpress"


@@ -104,7 +106,7 @@ execute "/opt/civicrm-#{civicrm_version}/civicrm" do
   subscribes :run, "execute[/var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz]", :immediately
 end
 
   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
   owner "www-data"
   group "www-data"
   mode 0755


@@ -121,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!(/%%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
   line.gsub!(/%%siteKey%%/, site_key)
 
   line