Avoid duplicate resource names for wordpress plugins and themes

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

diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 397a5815dfeb9636f0c10bc71fc3e57095658b89..64c0726f71da238c32c7182747d69ad4026aba46 100644 (file)
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -17,8 +17,6 @@
 # limitations under the License.
 #
 
-node.default[:ssl][:certificates] = node[:ssl][:certificates] | ["osmfoundation"]
-
 include_recipe "wordpress"
 
 passwords = data_bag_item("switch2osm", "passwords")
@@ -27,50 +25,56 @@ wordpress_site "switch2osm.org" do
   aliases ["www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"]
   directory "/srv/switch2osm.org"
   ssl_enabled true
-  ssl_certificate "osmfoundation"
-  ssl_certificate_chain "startcom"
   database_name "switch2osm-blog"
   database_user "switch2osm-user"
   database_password passwords["switch2osm-user"]
 end
 
-wordpress_theme "picolight" do
+wordpress_theme "switch2osm.org-picolight" do
+  name "picolight"
   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
+  name "sitepress-multilingual-cms"
   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
-wordpress_plugin "wpml-cms-nav" do
+wordpress_plugin "switch2osm.org-wpml-cms-nav" do
+  name "wpml-cms-nav"
   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-cms-nav.git"
 end
 
-wordpress_plugin "wpml-sticky-links" do
+wordpress_plugin "switch2osm.org-wpml-sticky-links" do
+  name "wpml-sticky-links"
   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-sticky-links.git"
 end
 
-wordpress_plugin "wpml-string-translation" do
+wordpress_plugin "switch2osm.org-wpml-string-translation" do
+  name "wpml-string-translation"
   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-string-translation.git"
 end
 
-wordpress_plugin "wpml-translation-analytics" do
+wordpress_plugin "switch2osm.org-wpml-translation-analytics" do
+  name "wpml-translation-analytics"
   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-translation-analytics.git"
 end
 
-wordpress_plugin "wpml-translation-management" do
+wordpress_plugin "switch2osm.org-wpml-translation-management" do
+  name "wpml-translation-management"
   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-translation-management.git"
 end
 
-wordpress_plugin "wpml-xliff" do
+wordpress_plugin "switch2osm.org-wpml-xliff" do
+  name "wpml-xliff"
   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-xliff.git"
 end
@@ -79,6 +83,6 @@ template "/etc/cron.daily/switch2osm-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end