From c2a9608f74511eeab26bf9cb940731c2a23797cf Mon Sep 17 00:00:00 2001
From: Matt Simerson <matt@tnpi.net>
Date: Fri, 15 Dec 2023 09:08:45 -0800
Subject: [PATCH] cleanups

---
 .release                |  2 +-
 config.js               |  6 ------
 plugins.js              |  1 +
 plugins/data.headers.js |  4 ----
 plugins/relay_all.js    | 13 -------------
 5 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 config.js
 delete mode 100644 plugins/data.headers.js
 delete mode 100644 plugins/relay_all.js

diff --git a/.release b/.release
index 0890e945e..181fc2a81 160000
--- a/.release
+++ b/.release
@@ -1 +1 @@
-Subproject commit 0890e945e4e061c96c7b2ab45017525904c17728
+Subproject commit 181fc2a81f7ab86628d39dc4dc8f74316a5121a9
diff --git a/config.js b/config.js
deleted file mode 100644
index 0de83a513..000000000
--- a/config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-'use strict'
-
-module.exports = require('haraka-config')
-
-// use emit is the same way util.deprecate does it, so follow that style
-process.emit('warning', 'Loading config via require("./config") is deprecated, please use: require("haraka-config") instead.')
diff --git a/plugins.js b/plugins.js
index 6c35839ba..261fe926a 100644
--- a/plugins.js
+++ b/plugins.js
@@ -363,6 +363,7 @@ plugins.deprecated = {
     'rcpt_to.qmail_deliverable' : 'qmail-deliverable',
     'rdns.regexp'         : 'access',
     'relay_acl'           : 'relay',
+    'relay_all'           : 'relay',
     'relay_force_routing' : 'relay',
 }
 
diff --git a/plugins/data.headers.js b/plugins/data.headers.js
deleted file mode 100644
index 090a2adf8..000000000
--- a/plugins/data.headers.js
+++ /dev/null
@@ -1,4 +0,0 @@
-
-exports.register = function () {
-    this.logerror(this, "data.headers is deprecated, remove it from config/plugins. See 'haraka -h headers'");
-}
diff --git a/plugins/relay_all.js b/plugins/relay_all.js
deleted file mode 100644
index 0329a601b..000000000
--- a/plugins/relay_all.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Just relay everything - could be useful for a spamtrap
-
-exports.register = function () {
-    this.logerror(this, "deprecated. see 'haraka -h relay'");
-    this.register_hook('rcpt', 'confirm_all');
-}
-
-exports.confirm_all = function (next, connection, params) {
-    const recipient = params.shift();
-    connection.loginfo(this, `confirming recipient ${recipient}`);
-    connection.relaying = true;
-    next(OK);
-}