From 326bfea5448bcd22cd294a1fd0f2505bf083f6cf Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 29 Jul 2020 14:47:16 +0100
Subject: [PATCH] Remove cleanup code

---
 cookbooks/dev/recipes/default.rb      | 2 --
 cookbooks/mailman/recipes/default.rb  | 2 --
 cookbooks/mediawiki/resources/site.rb | 2 --
 cookbooks/wordpress/resources/site.rb | 2 --
 4 files changed, 8 deletions(-)

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index e33c3b230..ed190970d 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -260,8 +260,6 @@ if node[:postgresql][:clusters][:"12/main"]
       site_aliases = details[:aliases] || []
       secret_key_base = persistent_token("dev", "rails", name, "secret_key_base")
 
-      node.rm_normal(:dev, :rails, name)
-
       postgresql_database database_name do
         cluster "12/main"
         owner "apis"
diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb
index 1759bf50b..af6daa14a 100644
--- a/cookbooks/mailman/recipes/default.rb
+++ b/cookbooks/mailman/recipes/default.rb
@@ -23,8 +23,6 @@ include_recipe "apache"
 
 package "mailman"
 
-node.rm_normal(:mailman, :subscribe_form_secret)
-
 subscribe_form_secret = persistent_token("mailman", "subscribe_form_secret")
 
 template "/etc/mailman/mm_cfg.py" do
diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index f2ff05050..a7cb8cf40 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -47,8 +47,6 @@ property :fpm_max_children, :kind_of => Integer, :default => 5
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
 action :create do
-  node.rm_normal(:mediawiki, :sites, new_resource.site)
-
   node.default[:mediawiki][:sites][new_resource.site] = {
     :directory => site_directory,
     :version => new_resource.version
diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb
index 99b506fd4..c86705d5d 100644
--- a/cookbooks/wordpress/resources/site.rb
+++ b/cookbooks/wordpress/resources/site.rb
@@ -34,8 +34,6 @@ property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 action :create do
   version = new_resource.version || Chef::Wordpress.current_version
 
-  node.rm_normal(:wordpress, :sites, new_resource.site)
-
   node.default[:wordpress][:sites][new_resource.site] = {
     :directory => site_directory
   }
-- 
2.43.2