Make replication delay monitoring more reliable

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

diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 48ef029f6c38a99f073e52aadfc7acc4a334326a..bb8eedd9bd6efb767ddd53a2aeb7322d990bf556 100644 (file)
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -30,52 +30,52 @@ wordpress_site "switch2osm.org" do
 end
 
 wordpress_theme "switch2osm.org-picolight" do
 end
 
 wordpress_theme "switch2osm.org-picolight" do

-  name "picolight"
+  theme "picolight"

   site "switch2osm.org"
   repository "git://github.com/Firefishy/picolight-s2o.git"
   revision "master"
 end
 
 wordpress_plugin "switch2osm.org-sitepress-multilingual-cms" do
   site "switch2osm.org"
   repository "git://github.com/Firefishy/picolight-s2o.git"
   revision "master"
 end
 
 wordpress_plugin "switch2osm.org-sitepress-multilingual-cms" do

-  name "sitepress-multilingual-cms"
+  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
 
 wordpress_plugin "switch2osm.org-wpml-cms-nav" do
 end
 
 wordpress_plugin "switch2osm.org-wpml-cms-nav" do

-  name "wpml-cms-nav"
+  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
 
 wordpress_plugin "switch2osm.org-wpml-sticky-links" do
 end
 
 wordpress_plugin "switch2osm.org-wpml-sticky-links" do

-  name "wpml-sticky-links"
+  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
 
 wordpress_plugin "switch2osm.org-wpml-string-translation" do
 end
 
 wordpress_plugin "switch2osm.org-wpml-string-translation" do

-  name "wpml-string-translation"
+  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
 
 wordpress_plugin "switch2osm.org-wpml-translation-analytics" do
 end
 
 wordpress_plugin "switch2osm.org-wpml-translation-analytics" do

-  name "wpml-translation-analytics"
+  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
 
 wordpress_plugin "switch2osm.org-wpml-translation-management" do
 end
 
 wordpress_plugin "switch2osm.org-wpml-translation-management" do

-  name "wpml-translation-management"
+  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
 
 wordpress_plugin "switch2osm.org-wpml-xliff" do
 end
 
 wordpress_plugin "switch2osm.org-wpml-xliff" do

-  name "wpml-xliff"
+  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
 end
 
 template "/etc/cron.daily/switch2osm-backup" do