Fix new foodcritic warnings

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

diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 45eb7f03ec3dcbeee30f9022348105420035fb79..5e2234f737fc8809cbb3c901e0d4330cb962e94e 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,


@@ -29,43 +29,51 @@ wordpress_site "switch2osm.org" do
   database_password passwords["switch2osm-user"]
 end
 
   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"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
   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
+  plugin "wpml-cms-nav"

   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-cms-nav.git"
 end
 
   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
+  plugin "wpml-sticky-links"

   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-sticky-links.git"
 end
 
   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
+  plugin "wpml-string-translation"

   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-string-translation.git"
 end
 
   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
+  plugin "wpml-translation-analytics"

   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-translation-analytics.git"
 end
 
   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
+  plugin "wpml-translation-management"

   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-translation-management.git"
 end
 
   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
+  plugin "wpml-xliff"

   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-xliff.git"
 end
   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-xliff.git"
 end


@@ -74,6 +82,6 @@ template "/etc/cron.daily/switch2osm-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0750
+  mode 0o750

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