Enable unified mode for custom resources

.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: .

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

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

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

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

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

cookbooks/imagery/resources/layer.rb

@@ -19,6 +19,8 @@
 
 require "yaml"
 
+unified_mode true
+
 default_action :create
 
 property :layer, String, :name_property => true

cookbooks/imagery/resources/site.rb

@@ -19,6 +19,8 @@
 
 require "yaml"
 
+unified_mode true
+
 default_action :create
 
 property :site, String, :name_property => true

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

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 @@
     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 @@
     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 @@
     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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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