Merge pull request #177 from jburgess777/jburgess-raise-tilecache-limits

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

diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 97a1d953038fa9a5fcd31ca384bc5a528a796cb1..bb8eedd9bd6efb767ddd53a2aeb7322d990bf556 100644 (file)
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -22,58 +22,66 @@ include_recipe "wordpress"
 passwords = data_bag_item("switch2osm", "passwords")
 
 wordpress_site "switch2osm.org" do
 passwords = data_bag_item("switch2osm", "passwords")
 
 wordpress_site "switch2osm.org" do

-  aliases "www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"
+  aliases ["www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"]

   directory "/srv/switch2osm.org"
   database_name "switch2osm-blog"
   database_user "switch2osm-user"
   database_password passwords["switch2osm-user"]
 end
 
   directory "/srv/switch2osm.org"
   database_name "switch2osm-blog"
   database_user "switch2osm-user"
   database_password passwords["switch2osm-user"]
 end
 

-wordpress_theme "picolight" do
+wordpress_theme "switch2osm.org-picolight" do
+  theme "picolight"

   site "switch2osm.org"
   repository "git://github.com/Firefishy/picolight-s2o.git"
   revision "master"
 end
 
   site "switch2osm.org"
   repository "git://github.com/Firefishy/picolight-s2o.git"
   revision "master"
 end
 

-wordpress_plugin "sitepress-multilingual-cms" do
+wordpress_plugin "switch2osm.org-sitepress-multilingual-cms" do
+  plugin "sitepress-multilingual-cms"

   site "switch2osm.org"
   site "switch2osm.org"

-  repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
+  repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"

 end
 
 end
 

-wordpress_plugin "wpml-cms-nav" do
+wordpress_plugin "switch2osm.org-wpml-cms-nav" do
+  plugin "wpml-cms-nav"

   site "switch2osm.org"
   site "switch2osm.org"

-  repository "git://chef.openstreetmap.org/wpml-cms-nav.git"
+  repository "https://git.openstreetmap.org/private/wpml-cms-nav.git"

 end
 
 end
 

-wordpress_plugin "wpml-sticky-links" do
+wordpress_plugin "switch2osm.org-wpml-sticky-links" do
+  plugin "wpml-sticky-links"

   site "switch2osm.org"
   site "switch2osm.org"

-  repository "git://chef.openstreetmap.org/wpml-sticky-links.git"
+  repository "https://git.openstreetmap.org/private/wpml-sticky-links.git"

 end
 
 end
 

-wordpress_plugin "wpml-string-translation" do
+wordpress_plugin "switch2osm.org-wpml-string-translation" do
+  plugin "wpml-string-translation"

   site "switch2osm.org"
   site "switch2osm.org"

-  repository "git://chef.openstreetmap.org/wpml-string-translation.git"
+  repository "https://git.openstreetmap.org/private/wpml-string-translation.git"

 end
 
 end
 

-wordpress_plugin "wpml-translation-analytics" do
+wordpress_plugin "switch2osm.org-wpml-translation-analytics" do
+  plugin "wpml-translation-analytics"

   site "switch2osm.org"
   site "switch2osm.org"

-  repository "git://chef.openstreetmap.org/wpml-translation-analytics.git"
+  repository "https://git.openstreetmap.org/private/wpml-translation-analytics.git"

 end
 
 end
 

-wordpress_plugin "wpml-translation-management" do
+wordpress_plugin "switch2osm.org-wpml-translation-management" do
+  plugin "wpml-translation-management"

   site "switch2osm.org"
   site "switch2osm.org"

-  repository "git://chef.openstreetmap.org/wpml-translation-management.git"
+  repository "https://git.openstreetmap.org/private/wpml-translation-management.git"

 end
 
 end
 

-wordpress_plugin "wpml-xliff" do
+wordpress_plugin "switch2osm.org-wpml-xliff" do
+  plugin "wpml-xliff"

   site "switch2osm.org"
   site "switch2osm.org"

-  repository "git://chef.openstreetmap.org/wpml-xliff.git"
+  repository "https://git.openstreetmap.org/private/wpml-xliff.git"

 end
 
 template "/etc/cron.daily/switch2osm-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/cron.daily/switch2osm-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0750
+  mode 0o750

   variables :passwords => passwords
 end
   variables :passwords => passwords
 end