Enable unified mode for custom resources

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 98635660c5f39dfe44fb1387eeba2c19e0e0f95b..a92cef294acfb249ea45ca0dde559e5fc631b239 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -6,13 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 41
-# Cop supports --auto-correct.
-# Configuration parameters: Include.
-# Include: **/resources/*.rb
-Chef/Deprecations/ResourceWithoutUnifiedTrue:
-  Enabled: false
-
 # Offense count: 1124
 # Cop supports --auto-correct.
 # Configuration parameters: .

diff --git a/cookbooks/apache/resources/conf.rb b/cookbooks/apache/resources/conf.rb
index 12daf87ab48ef39d5bf0e1c84b09da69a07c0f9f..9f1efb24f284f6b8d4c725b925f1946c3927418b 100644 (file)
--- a/cookbooks/apache/resources/conf.rb
+++ b/cookbooks/apache/resources/conf.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action [:create, :enable]
 
 property :conf, :kind_of => String, :name_property => true

diff --git a/cookbooks/apache/resources/module.rb b/cookbooks/apache/resources/module.rb
index 6658d52a66320e95f8fbb6045b1c0b9ec515a57d..5de2bfcaade352b9623842a44031b02e297e1799 100644 (file)
--- a/cookbooks/apache/resources/module.rb
+++ b/cookbooks/apache/resources/module.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action [:install, :enable]
 
 property :module, :kind_of => String, :name_property => true

diff --git a/cookbooks/apache/resources/site.rb b/cookbooks/apache/resources/site.rb
index e039e3ac529e93a67a88d04676678205573fd0b8..598f841ff86e131abea1546c3370e38b56577342 100644 (file)
--- a/cookbooks/apache/resources/site.rb
+++ b/cookbooks/apache/resources/site.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action [:create, :enable]
 
 property :site, :kind_of => String, :name_property => true

diff --git a/cookbooks/fail2ban/resources/filter.rb b/cookbooks/fail2ban/resources/filter.rb
index 3cd173eee70e937b19e86e41c74677874a5ea6f4..13a7782950875e3929df01f5fc5027ffc22392d7 100644 (file)
--- a/cookbooks/fail2ban/resources/filter.rb
+++ b/cookbooks/fail2ban/resources/filter.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :filter, :kind_of => String, :name_property => true

diff --git a/cookbooks/fail2ban/resources/jail.rb b/cookbooks/fail2ban/resources/jail.rb
index 6ff5307e3bd939775f273718ab59a4bdc8e7f60c..3af0960e9727827687aa9bf1facf715f4fcc13a4 100644 (file)
--- a/cookbooks/fail2ban/resources/jail.rb
+++ b/cookbooks/fail2ban/resources/jail.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :jail, :kind_of => String, :name_property => true

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 6affe4b80b06fe291e0450dcb9748660002f7cc9..dc1fd51bb1189b5b5592d0f70b64253f93d8e96c 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -19,6 +19,8 @@
 
 require "yaml"
 
+unified_mode true
+
 default_action :create
 
 property :layer, String, :name_property => true

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index c30c26d9592d445ebfc733f9091ea31472bdee02..e64231a72d86655345526f6a4eacd244d874f91c 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -19,6 +19,8 @@
 
 require "yaml"
 
+unified_mode true
+
 default_action :create
 
 property :site, String, :name_property => true

diff --git a/cookbooks/mediawiki/resources/extension.rb b/cookbooks/mediawiki/resources/extension.rb
index 9f477a53f695a66c8423f1c6d563f2263d3c1d43..4e44f18c2ad426fd8d81c810d137e58bebcc7701 100644 (file)
--- a/cookbooks/mediawiki/resources/extension.rb
+++ b/cookbooks/mediawiki/resources/extension.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :extension, :kind_of => String, :name_property => true

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index d3fd852eef860ee2979b34aff5a10b3aba579b6f..1931dc9e2d6d238125e37642142b710147529506 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :site, :kind_of => String, :name_property => true
@@ -76,27 +78,6 @@ action :create do
     end
   end
 
-  execute "#{mediawiki_directory}/maintenance/install.php" do
-    action :nothing
-    # Use metanamespace as Site Name to ensure correct set namespace
-    command "php maintenance/install.php --server '#{name}' --dbtype 'mysql' --dbname '#{new_resource.database_name}' --dbuser '#{new_resource.database_user}' --dbpass '#{new_resource.database_password}' --dbserver 'localhost' --scriptpath /w --pass '#{new_resource.admin_password}' '#{new_resource.metanamespace}' '#{new_resource.admin_user}'"
-    cwd mediawiki_directory
-    user node[:mediawiki][:user]
-    group node[:mediawiki][:group]
-    not_if do
-      ::File.exist?("#{mediawiki_directory}/LocalSettings-install.php")
-    end
-    notifies :run, "ruby_block[rename-installer-localsettings]", :immediately
-  end
-
-  execute "#{mediawiki_directory}/maintenance/update.php" do
-    action :nothing
-    command "php maintenance/update.php --quick"
-    cwd mediawiki_directory
-    user node[:mediawiki][:user]
-    group node[:mediawiki][:group]
-  end
-
   declare_resource :directory, site_directory do
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
@@ -121,6 +102,14 @@ action :create do
     notifies :run, "execute[#{mediawiki_directory}/maintenance/update.php]"
   end
 
+  template "#{mediawiki_directory}/composer.local.json" do
+    cookbook "mediawiki"
+    source "composer.local.json.erb"
+    owner node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+    mode "664"
+  end
+
   execute "#{mediawiki_directory}/composer.json" do
     action :nothing
     command "composer update --no-dev"
@@ -130,12 +119,25 @@ action :create do
     environment "COMPOSER_HOME" => site_directory
   end
 
-  template "#{mediawiki_directory}/composer.local.json" do
-    cookbook "mediawiki"
-    source "composer.local.json.erb"
-    owner node[:mediawiki][:user]
+  execute "#{mediawiki_directory}/maintenance/install.php" do
+    action :nothing
+    # Use metanamespace as Site Name to ensure correct set namespace
+    command "php maintenance/install.php --server '#{name}' --dbtype 'mysql' --dbname '#{new_resource.database_name}' --dbuser '#{new_resource.database_user}' --dbpass '#{new_resource.database_password}' --dbserver 'localhost' --scriptpath /w --pass '#{new_resource.admin_password}' '#{new_resource.metanamespace}' '#{new_resource.admin_user}'"
+    cwd mediawiki_directory
+    user node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+    not_if do
+      ::File.exist?("#{mediawiki_directory}/LocalSettings-install.php")
+    end
+    notifies :run, "ruby_block[rename-installer-localsettings]", :immediately
+  end
+
+  execute "#{mediawiki_directory}/maintenance/update.php" do
+    action :nothing
+    command "php maintenance/update.php --quick"
+    cwd mediawiki_directory
+    user node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode "664"
   end
 
   # Safety catch if git doesn't update but install.php hasn't run

diff --git a/cookbooks/mediawiki/resources/skin.rb b/cookbooks/mediawiki/resources/skin.rb
index f70ad6afeb029f28f879c94c100502236fcd7257..3153fa91a772b37b4e15b682015e782f89f81be6 100644 (file)
--- a/cookbooks/mediawiki/resources/skin.rb
+++ b/cookbooks/mediawiki/resources/skin.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :skin, :kind_of => String, :name_property => true

diff --git a/cookbooks/munin/resources/plugin.rb b/cookbooks/munin/resources/plugin.rb
index bc58bf9751df3cd0b2ce6a07386883f5a54a1e73..10c149436b7c79d96b59a738eeb39e1d22c51326 100644 (file)
--- a/cookbooks/munin/resources/plugin.rb
+++ b/cookbooks/munin/resources/plugin.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :plugin, :kind_of => String, :name_property => true

diff --git a/cookbooks/munin/resources/plugin_conf.rb b/cookbooks/munin/resources/plugin_conf.rb
index 6105f0d2b94b4e7bc6f11f1724148b6e177cd5c8..8306b046bf3995266916f686153f7eac90285a20 100644 (file)
--- a/cookbooks/munin/resources/plugin_conf.rb
+++ b/cookbooks/munin/resources/plugin_conf.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :plugin_conf, :kind_of => String, :name_property => true

diff --git a/cookbooks/mysql/resources/database.rb b/cookbooks/mysql/resources/database.rb
index 65b6d2e224b14799ee593238473f9e8d0e32e8b3..69e4e795fe9d038cd97f78a8682b8aee943ca12f 100644 (file)
--- a/cookbooks/mysql/resources/database.rb
+++ b/cookbooks/mysql/resources/database.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :database, :kind_of => String, :name_property => true

diff --git a/cookbooks/mysql/resources/user.rb b/cookbooks/mysql/resources/user.rb
index 078316fc815ed75d4319e430fee4472cb3e6f5a8..944cfcc6f3ef5c2a570b7708ad9e2f6267008c79 100644 (file)
--- a/cookbooks/mysql/resources/user.rb
+++ b/cookbooks/mysql/resources/user.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :user, :kind_of => String, :name_property => true

diff --git a/cookbooks/networking/resources/firewall_rule.rb b/cookbooks/networking/resources/firewall_rule.rb
index e92681ec7601fc08364a6e3fd66f96459f47aed8..a3e2e7eb0bb0816cf37dde3be25892199958a1a0 100644 (file)
--- a/cookbooks/networking/resources/firewall_rule.rb
+++ b/cookbooks/networking/resources/firewall_rule.rb
@@ -20,6 +20,8 @@
 resource_name :firewall_rule
 provides :firewall_rule
 
+unified_mode true
+
 default_action :nothing
 
 property :rule, :kind_of => String, :name_property => true

diff --git a/cookbooks/nginx/resources/site.rb b/cookbooks/nginx/resources/site.rb
index 45422434a9274b66d0b69a501361cc8c153a8f93..b1a4b5970ddbcc01e4845511636aee257930db88 100644 (file)
--- a/cookbooks/nginx/resources/site.rb
+++ b/cookbooks/nginx/resources/site.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :site, :kind_of => String, :name_property => true

diff --git a/cookbooks/nodejs/resources/package.rb b/cookbooks/nodejs/resources/package.rb
index b5024147acc891f509a64d3805adda1e9454641a..5279cc91a09f851c0a052b79b95937e542947513 100644 (file)
--- a/cookbooks/nodejs/resources/package.rb
+++ b/cookbooks/nodejs/resources/package.rb
@@ -19,6 +19,8 @@
 
 require "json"
 
+unified_mode true
+
 default_action :install
 
 property :package, :kind_of => String, :name_property => true

diff --git a/cookbooks/ohai/resources/plugin.rb b/cookbooks/ohai/resources/plugin.rb
index 5d550371faf7997fa3d8396ab03fa60cf4a2b55d..d5f1c42fe907218c8a00cde5ed3f99f86d5abfde 100644 (file)
--- a/cookbooks/ohai/resources/plugin.rb
+++ b/cookbooks/ohai/resources/plugin.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :plugin, :kind_of => String, :name_property => true

diff --git a/cookbooks/passenger/resources/application.rb b/cookbooks/passenger/resources/application.rb
index 3eef14c7f8d8c767f69c6595f65dfd2e9e7da029..5f5e2efbb4c064a0207dceb900301d73f2acdb9e 100644 (file)
--- a/cookbooks/passenger/resources/application.rb
+++ b/cookbooks/passenger/resources/application.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :restart
 
 property :application, String, :name_property => true

diff --git a/cookbooks/php/resources/fpm.rb b/cookbooks/php/resources/fpm.rb
index abdc582c8ccaef11dd7ad0d7501b27087b1346ad..657f3b51b285e9d6302219c28fff1c855d8b593c 100644 (file)
--- a/cookbooks/php/resources/fpm.rb
+++ b/cookbooks/php/resources/fpm.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :pool, :kind_of => String, :name_property => true

diff --git a/cookbooks/postgresql/resources/database.rb b/cookbooks/postgresql/resources/database.rb
index c73250464c99b35a865ed9f2da62b9d7ac6fe9a8..2d14cdfd15421847b0d9767a9ce728c76e4a6e9d 100644 (file)
--- a/cookbooks/postgresql/resources/database.rb
+++ b/cookbooks/postgresql/resources/database.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :database, :kind_of => String, :name_property => true

diff --git a/cookbooks/postgresql/resources/execute.rb b/cookbooks/postgresql/resources/execute.rb
index 3845546bcfd65630512c9d47829b7da6852bdc4f..4f7217ec850a82fe81f08d16083412f0b45a1406 100644 (file)
--- a/cookbooks/postgresql/resources/execute.rb
+++ b/cookbooks/postgresql/resources/execute.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :run
 
 property :command, :kind_of => String, :name_property => true

diff --git a/cookbooks/postgresql/resources/extension.rb b/cookbooks/postgresql/resources/extension.rb
index 3adcfd62b26761df9eb16869abb7ce93927e4a34..ec60fb9752aace2bcb9b5069abb4740fa1f25254 100644 (file)
--- a/cookbooks/postgresql/resources/extension.rb
+++ b/cookbooks/postgresql/resources/extension.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :extension, :kind_of => String, :name_property => true

diff --git a/cookbooks/postgresql/resources/munin.rb b/cookbooks/postgresql/resources/munin.rb
index 311325b0f1b141a2cee6bb450e136cf0b782bfb5..4b69d422411522cb51dd252ce8cfd589c7dd07d4 100644 (file)
--- a/cookbooks/postgresql/resources/munin.rb
+++ b/cookbooks/postgresql/resources/munin.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :munin, :kind_of => String, :name_property => true

diff --git a/cookbooks/postgresql/resources/table.rb b/cookbooks/postgresql/resources/table.rb
index ed26559326cfbda1db84e665df8f2ddd76ababdf..f97417895e6780b2a290657a3e77dfe955719032 100644 (file)
--- a/cookbooks/postgresql/resources/table.rb
+++ b/cookbooks/postgresql/resources/table.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :table, :kind_of => String, :name_property => true

diff --git a/cookbooks/postgresql/resources/tablespace.rb b/cookbooks/postgresql/resources/tablespace.rb
index 69e0ce2b0c508e68dbf2106f28e1f1ea0ca17b2f..bfa0c4b8cd361ace35d030ae28f470c84314a609 100644 (file)
--- a/cookbooks/postgresql/resources/tablespace.rb
+++ b/cookbooks/postgresql/resources/tablespace.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :tablespace, :kind_of => String, :name_property => true

diff --git a/cookbooks/postgresql/resources/user.rb b/cookbooks/postgresql/resources/user.rb
index ad8fed4d5f8e5047628e276cda344f6b30f58d45..35ff5aa8ba153ecc9e8376a165b595e5c9f59bc3 100644 (file)
--- a/cookbooks/postgresql/resources/user.rb
+++ b/cookbooks/postgresql/resources/user.rb
@@ -19,6 +19,8 @@
 
 require "shellwords"
 
+unified_mode true
+
 default_action :create
 
 property :user, :kind_of => String, :name_property => true

diff --git a/cookbooks/prometheus/resources/collector.rb b/cookbooks/prometheus/resources/collector.rb
index c9c28fc6e8046d5c9ce74b3915e48da1a7ab882e..4a0c22d9b61a28dcfe1e8b0bd010b4cdbf5d60b7 100644 (file)
--- a/cookbooks/prometheus/resources/collector.rb
+++ b/cookbooks/prometheus/resources/collector.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :collector, :kind_of => String, :name_property => true

diff --git a/cookbooks/prometheus/resources/exporter.rb b/cookbooks/prometheus/resources/exporter.rb
index bab318a4ab92edb2f43b15a91e89d2c009b2925f..df5304b3c3aeeebf5a92332237dda68605a97a38 100644 (file)
--- a/cookbooks/prometheus/resources/exporter.rb
+++ b/cookbooks/prometheus/resources/exporter.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :exporter, :kind_of => String, :name_property => true

diff --git a/cookbooks/python/resources/package.rb b/cookbooks/python/resources/package.rb
index 0679e87e34f7b75030610c1d79be94a7e6a17643..0a3f491705429e99fc253bb3f63d4b181b716f62 100644 (file)
--- a/cookbooks/python/resources/package.rb
+++ b/cookbooks/python/resources/package.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :install
 
 property :package_name, :kind_of => String, :name_property => true

diff --git a/cookbooks/python/resources/virtualenv.rb b/cookbooks/python/resources/virtualenv.rb
index 6f07fd895bf69116a18f393e6895be8880bcfa29..8b13917614daadcdb2ce9d4f4d7fbedd77d0693f 100644 (file)
--- a/cookbooks/python/resources/virtualenv.rb
+++ b/cookbooks/python/resources/virtualenv.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :virtualenv_directory, :kind_of => String, :name_property => true

diff --git a/cookbooks/squid/resources/fragment.rb b/cookbooks/squid/resources/fragment.rb
index f4099ad7bd9fb4b62b0a753bee8f56d50342382d..a418d6bcd8bf2d2bf247c1b03778903640d71f65 100644 (file)
--- a/cookbooks/squid/resources/fragment.rb
+++ b/cookbooks/squid/resources/fragment.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :fragment, :kind_of => String, :name_property => true

diff --git a/cookbooks/ssl/resources/certificate.rb b/cookbooks/ssl/resources/certificate.rb
index 5fc33b61be6e8a992b048967fbc86f6c85755ae2..f2fb4784c35219d6281d5ffb62f00d86c840c80e 100644 (file)
--- a/cookbooks/ssl/resources/certificate.rb
+++ b/cookbooks/ssl/resources/certificate.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :certificate, String, :name_property => true

diff --git a/cookbooks/systemd/resources/path.rb b/cookbooks/systemd/resources/path.rb
index 29bbfa51c1782a664e8d809cddf76812871df5a2..52f5576c6a86fa4f979505f4e8c5f71045bdcbbd 100644 (file)
--- a/cookbooks/systemd/resources/path.rb
+++ b/cookbooks/systemd/resources/path.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :path, String, :name_property => true

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index 62c9596921cf4c04972ec49cff4ae377f367e6b0..abfacb6502aed111dbfed4fcc005ac1bb370d934 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :service, String, :name_property => true

diff --git a/cookbooks/systemd/resources/timer.rb b/cookbooks/systemd/resources/timer.rb
index 7dc4cab6544a69b8be0dbd93c660e0d39166a9cf..8ace5bfe9e5738250bf8383440c6fca5080137dd 100644 (file)
--- a/cookbooks/systemd/resources/timer.rb
+++ b/cookbooks/systemd/resources/timer.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :timer, String, :name_property => true

diff --git a/cookbooks/systemd/resources/tmpfile.rb b/cookbooks/systemd/resources/tmpfile.rb
index 38538e15f22bd0aaace63faa7fd48a56eb85f964..07c39d3a9ccc62908428777f4aa6a5488831e3a4 100644 (file)
--- a/cookbooks/systemd/resources/tmpfile.rb
+++ b/cookbooks/systemd/resources/tmpfile.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :type, String, :required => [:create]

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 90028e9f9833a272b12873b3bf4031443bf26a12..e0c9cad9177b028b4dddf27fea4d2f508b460ff9 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -22,6 +22,8 @@ require "yaml"
 resource_name :rails_port
 provides :rails_port
 
+unified_mode true
+
 default_action :create
 
 property :site, String, :name_property => true

diff --git a/cookbooks/wordpress/resources/plugin.rb b/cookbooks/wordpress/resources/plugin.rb
index ccc8010d5d2dfaae52ce22d8ef064df0d55d6dac..82c7ae5e2357a1e867d64e788e19ac9bdab65edb 100644 (file)
--- a/cookbooks/wordpress/resources/plugin.rb
+++ b/cookbooks/wordpress/resources/plugin.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :plugin, :kind_of => String, :name_property => true

diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb
index a00cd9cac032d6096589e8db7352f87b77ee73f1..1d419c14e152fb32e82f8d3a95f89401b4d2385c 100644 (file)
--- a/cookbooks/wordpress/resources/site.rb
+++ b/cookbooks/wordpress/resources/site.rb
@@ -18,6 +18,8 @@
 
 require "securerandom"
 
+unified_mode true
+
 default_action :create
 
 property :site, :kind_of => String, :name_property => true

diff --git a/cookbooks/wordpress/resources/theme.rb b/cookbooks/wordpress/resources/theme.rb
index 3e8fabe94af4e8faa52f5e79076d5edb4543f02c..994cf1223126475efe0be3b62eac0a2f7b53d82d 100644 (file)
--- a/cookbooks/wordpress/resources/theme.rb
+++ b/cookbooks/wordpress/resources/theme.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :theme, :kind_of => String, :name_property => true