From feb6a00ff7472578d07afc39fbc0eded52245727 Mon Sep 17 00:00:00 2001
From: Grant Slater <git@firefishy.com>
Date: Sun, 14 Aug 2022 03:45:46 +0300
Subject: [PATCH] Remove remnants of mcelog

mcelog was replaced by rasdaemon in Ubuntu 18.04 but old installs
where previously never cleaned up.
---
 cookbooks/hardware/recipes/default.rb              | 14 ++++++++++++++
 .../hardware/templates/default/mcelog-trigger.erb  |  5 -----
 roles/scorch.rb                                    |  5 -----
 roles/shenron.rb                                   |  3 ---
 4 files changed, 14 insertions(+), 13 deletions(-)
 delete mode 100644 cookbooks/hardware/templates/default/mcelog-trigger.erb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index dd4448180..23e0d2105 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -225,6 +225,20 @@ ohai_plugin "lldp" do
   template "lldp.rb.erb"
 end
 
+%w[bus cache dimm iomca page socket-memory unknown].each do |trigger|
+  file "/etc/mcelog/#{trigger}-error-trigger.local" do
+    action :delete
+  end
+end
+
+service "mcelog" do
+  action [:stop, :disable]
+end
+
+package "mcelog" do
+  action :purge
+end
+
 tools_packages = []
 status_packages = {}
 
diff --git a/cookbooks/hardware/templates/default/mcelog-trigger.erb b/cookbooks/hardware/templates/default/mcelog-trigger.erb
deleted file mode 100644
index 463b39041..000000000
--- a/cookbooks/hardware/templates/default/mcelog-trigger.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# DO NOT EDIT - This file is being maintained by Chef
-
-echo "$MESSAGE" | /usr/bin/mail -s "Machine Check Exception for <%= node[:fqdn] %>" admins@openstreetmap.org
diff --git a/roles/scorch.rb b/roles/scorch.rb
index 36b8e4450..86c38424e 100644
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -15,11 +15,6 @@ default_attributes(
       }
     }
   },
-  :hardware => {
-    :mcelog => {
-      :enabled => false
-    }
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
diff --git a/roles/shenron.rb b/roles/shenron.rb
index c57441b11..c82e4cd21 100644
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -15,9 +15,6 @@ default_attributes(
         :ignore => %w[in6]
       }
     },
-    :mcelog => {
-      :enabled => false
-    },
     :modules => [
       "it87"
     ]
-- 
2.39.5