Update formatting of header comments

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

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 46df483cdcd06c9bb8bf6d2d60ec36614e7716d1..46c17d5040d2ab1af156c814a9f2710fde3b432d 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: civicrm
+# Cookbook:: civicrm
 # Recipe:: default
 #
-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -37,7 +37,6 @@ end
 
 wordpress_site "join.osmfoundation.org" do
   aliases "crm.osmfoundation.org"
-  ssl_enabled true
   database_name "civicrm"
   database_user "civicrm"
   database_password database_password
@@ -54,7 +53,7 @@ end
 
 wordpress_plugin "sitepress-multilingual-cms" do
   site "join.osmfoundation.org"
-  repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
+  repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
 end
 
 wordpress_plugin "contact-form-7" do
@@ -154,6 +153,7 @@ settings = edit_file "#{civicrm_directory}/civicrm/templates/CRM/common/civicrm.
   line.gsub!(/%%baseURL%%/, "http://join.osmfoundation.org/")
   line.gsub!(/%%siteKey%%/, site_key)
   line.gsub!(%r{// *(.*'ext_repo_url'.*)$}, "\\1")
+  line.gsub!(%r{// *define\('CIVICRM_CMSDIR', '/path/to/install/root/'\);}, "define('CIVICRM_CMSDIR', '/srv/join.osmfoundation.org');")
 
   line
 end