Avoid duplicate resource names for wordpress plugins and themes

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 83f022ee3b7c8fcd3a9aa1fe7fc4055378715ed0..dbfcb475547b48355ccc726a3e48a63ff61f37aa 100644 (file)
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -41,29 +41,35 @@ wordpress_site "blog.openstreetmap.org" do
        "/static" => "/srv/blog.openstreetmap.org/static"
 end
 
-wordpress_theme "osmblog-wp-theme" do
+wordpress_theme "blog.openstreetmap.org-osmblog-wp-theme" do
+  name "osmblog-wp-theme"
   site "blog.openstreetmap.org"
   repository "git://github.com/harry-wood/osmblog-wp-theme.git"
 end
 
-wordpress_plugin "google-analytics-for-wordpress" do
+wordpress_plugin "blog.openstreetmap.org-google-analytics-for-wordpress" do
+  name "google-analytics-for-wordpress"
   site "blog.openstreetmap.org"
 end
 
-wordpress_plugin "google-sitemap-generator" do
+wordpress_plugin "blog.openstreetmap.org-google-sitemap-generator" do
+  name "google-sitemap-generator"
   site "blog.openstreetmap.org"
 end
 
-wordpress_plugin "shareadraft" do
+wordpress_plugin "blog.openstreetmap.org-shareadraft" do
+  name "shareadraft"
   site "blog.openstreetmap.org"
 end
 
-wordpress_plugin "sitepress-multilingual-cms" do
+wordpress_plugin "blog.openstreetmap.org-sitepress-multilingual-cms" do
+  name "sitepress-multilingual-cms"
   site "blog.openstreetmap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
-wordpress_plugin "wordpress-importer" do
+wordpress_plugin "blog.openstreetmap.org-wordpress-importer" do
+  name "wordpress-importer"
   site "blog.openstreetmap.org"
 end
 
@@ -95,6 +101,7 @@ ssl_certificate "opengeodata.org" do
   domains ["opengeodata.org", "www.opengeodata.org", "old.opengeodata.org"]
   notifies :reload, "service[apache2]"
 end
+
 apache_site "opengeodata.org" do
   template "opengeodata.erb"
   directory "/srv/opengeodata.org"

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index e8b3f782770a494a65a33e2554527564fe3fd324..f069e0d49cf85931ee58b294cdeaa502f17180b3 100644 (file)
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -56,13 +56,15 @@ wordpress_site "2007.stateofthemap.org" do
   database_prefix "wp_sotm_"
 end
 
-wordpress_theme "refreshwp-11" do
+wordpress_theme "2007.stateofthemap.org-refreshwp-11" do
+  name "refreshwp-11"
   site "2007.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2007"
 end
 
-wordpress_plugin "geopress" do
+wordpress_plugin "2007.stateofthemap.org-geopress" do
+  name "geopress"
   site "2007.stateofthemap.org"
 end
 
@@ -82,13 +84,15 @@ wordpress_site "2008.stateofthemap.org" do
   database_prefix "wp_sotm08_"
 end
 
-wordpress_theme "refreshwp-11" do
+wordpress_theme "2008.stateofthemap.org-refreshwp-11" do
+  name "refreshwp-11"
   site "2008.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2008"
 end
 
-wordpress_plugin "geopress" do
+wordpress_plugin "2008.stateofthemap.org-geopress" do
+  name "geopress"
   site "2008.stateofthemap.org"
 end
 
@@ -118,13 +122,15 @@ wordpress_site "2009.stateofthemap.org" do
        "/podcasts" => "/srv/2009.stateofthemap.org/podcasts"
 end
 
-wordpress_theme "aerodrome" do
+wordpress_theme "2009.stateofthemap.org-aerodrome" do
+  name "aerodrome"
   site "2009.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2009"
 end
 
-wordpress_plugin "wp-sticky" do
+wordpress_plugin "2009.stateofthemap.org-wp-sticky" do
+  name "wp-sticky"
   site "2009.stateofthemap.org"
 end
 
@@ -152,18 +158,21 @@ wordpress_site "2010.stateofthemap.org" do
   urls "/register" => "/srv/2010.stateofthemap.org/register"
 end
 
-wordpress_theme "aerodrome" do
+wordpress_theme "2010.stateofthemap.org-aerodrome" do
+  name "aerodrome"
   site "2010.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2010"
 end
 
-wordpress_plugin "sitepress-multilingual-cms" do
+wordpress_plugin "2010.stateofthemap.org-sitepress-multilingual-cms" do
+  name "sitepress-multilingual-cms"
   site "2010.stateofthemap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
-wordpress_plugin "wp-sticky" do
+wordpress_plugin "2010.stateofthemap.org-wp-sticky" do
+  name "wp-sticky"
   site "2010.stateofthemap.org"
 end
 
@@ -191,18 +200,21 @@ wordpress_site "2011.stateofthemap.org" do
   urls "/register" => "/srv/2011.stateofthemap.org/register"
 end
 
-wordpress_theme "aerodrome" do
+wordpress_theme "2011.stateofthemap.org-aerodrome" do
+  name "aerodrome"
   site "2011.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2011"
 end
 
-wordpress_plugin "sitepress-multilingual-cms" do
+wordpress_plugin "2011.stateofthemap.org-sitepress-multilingual-cms" do
+  name "sitepress-multilingual-cms"
   site "2011.stateofthemap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
-wordpress_plugin "wp-sticky" do
+wordpress_plugin "2011.stateofthemap.org-wp-sticky" do
+  name "wp-sticky"
   site "2011.stateofthemap.org"
 end
 
@@ -230,22 +242,26 @@ wordpress_site "2012.stateofthemap.org" do
   urls "/register" => "/srv/2012.stateofthemap.org/register"
 end
 
-wordpress_theme "aerodrome" do
+wordpress_theme "2012.stateofthemap.org-aerodrome" do
+  name "aerodrome"
   site "2012.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2012"
 end
 
-wordpress_plugin "leaflet-maps-marker" do
+wordpress_plugin "2012.stateofthemap.org-leaflet-maps-marker" do
+  name "leaflet-maps-marker"
   site "2012.stateofthemap.org"
 end
 
-wordpress_plugin "sitepress-multilingual-cms" do
+wordpress_plugin "2012.stateofthemap.org-sitepress-multilingual-cms" do
+  name "sitepress-multilingual-cms"
   site "2012.stateofthemap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
-wordpress_plugin "wp-sticky" do
+wordpress_plugin "2012.stateofthemap.org-wp-sticky" do
+  name "wp-sticky"
   site "2012.stateofthemap.org"
 end
 

diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index bc751a9623627eb5034668411400fecd6a20106d..64c0726f71da238c32c7182747d69ad4026aba46 100644 (file)
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -30,43 +30,51 @@ wordpress_site "switch2osm.org" do
   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