From f373a70d9926204edc0a0aefd9839ce6a7b72c4f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Pialasse <jpp@koozali.org>
Date: Mon, 30 Dec 2024 22:09:57 -0500
Subject: [PATCH] * Mon Dec 30 2024 Jean-Philippe Pialasse <jpp@koozali.org>
 11.0.1-3.sme - move action pseudonym-cleanup and migrate 10AdminEmail to
 smeserver-email [SME: 12808]

---
 createlinks                                   | 10 --------
 .../e-smith/db/accounts/migrate/10AdminEmail  | 24 -------------------
 .../e-smith/events/actions/pseudonym-cleanup  | 22 -----------------
 smeserver-mini-qmail.spec                     |  7 ++++--
 4 files changed, 5 insertions(+), 58 deletions(-)
 delete mode 100644 root/etc/e-smith/db/accounts/migrate/10AdminEmail
 delete mode 100644 root/etc/e-smith/events/actions/pseudonym-cleanup

diff --git a/createlinks b/createlinks
index 37a0f73..a0ccfda 100755
--- a/createlinks
+++ b/createlinks
@@ -45,7 +45,6 @@ $event = "console-save";
 #--------------------------------------------------
 $event = "bootstrap-console-save";
 
-event_link("pseudonym-cleanup", $event, "03");
 event_link("qmail-update-user", $event, "55");
 
 #--------------------------------------------------
@@ -70,29 +69,22 @@ $event = "domain-delete";
 $event = "email-update";
 
 event_link("qmail-update-user", $event, "03");
-event_link("pseudonym-cleanup", $event, "30");
 
 #--------------------------------------------------
 # actions for group-create event:
 #--------------------------------------------------
 $event = "group-create";
 
-event_link("pseudonym-cleanup", $event, "03");
-
 #--------------------------------------------------
 # actions for group-delete event:
 #--------------------------------------------------
 $event = "group-delete";
 
-event_link("pseudonym-cleanup", $event, "03");
-
 #--------------------------------------------------
 # actions for group-modify event:
 #--------------------------------------------------
 $event = "group-modify";
 
-event_link("pseudonym-cleanup", $event, "03");
-
 #--------------------------------------------------
 # actions for user-create event:
 #--------------------------------------------------
@@ -133,7 +125,6 @@ $event = "ip-change";
 # actions for smeserver-mini-qmail-update event:
 #--------------------------------------------------
 $event = "smeserver-mini-qmail-update";
-event_link("pseudonym-cleanup", $event, "03");
 
 #--------------------------------------------------
 # actions for pseudonym-{create,delete,modify}
@@ -142,7 +133,6 @@ foreach $event ( qw(pseudonym-create pseudonym-modify pseudonym-delete
 		    user-create user-modify user-delete
 		))
 {
-    event_link("pseudonym-cleanup", $event, "03");
     templates2events("/var/qmail/control/virtualdomains", $event);
 }
 
diff --git a/root/etc/e-smith/db/accounts/migrate/10AdminEmail b/root/etc/e-smith/db/accounts/migrate/10AdminEmail
deleted file mode 100644
index 84a9c84..0000000
--- a/root/etc/e-smith/db/accounts/migrate/10AdminEmail
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    my $conf = esmith::ConfigDB->open;
-    return unless $conf;
-
-    my $admin_email = $conf->get_value_and_delete('AdminEmail');
-    return unless defined $admin_email;
-
-    my $admin = $DB->get('admin') ||
-		$DB->new_record('admin', {type => 'system'});
-    if ($admin_email)
-    {
-	$admin->merge_props(
-		EmailForward => 'forward',
-		ForwardAddress => $admin_email,
-	    );
-    }
-    else
-    {
-	$admin->merge_props(
-		EmailForward => 'local',
-		ForwardAddress => '',
-	    );
-    }
-}
diff --git a/root/etc/e-smith/events/actions/pseudonym-cleanup b/root/etc/e-smith/events/actions/pseudonym-cleanup
deleted file mode 100644
index c25c9d3..0000000
--- a/root/etc/e-smith/events/actions/pseudonym-cleanup
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use esmith::AccountsDB;
-use esmith::event;
-
-my $accounts = esmith::AccountsDB->open() or
-    die "Unable to open accounts db: $!";
-
-my ($self, $account) = @ARGV;
-
-# Find all "pseudonyms" entries in the e-smith accounts database and
-# if the pseudonyms has an unexisting Account associated we change 
-# it to user "admin".
-
-foreach my $pseudo ( $accounts->pseudonyms ) {
-    unless ( $accounts->get($pseudo->prop('Account')) ) {
-        $pseudo->set_prop( 'Account', 'admin' );
-    print "orphaned pseudonym " . $pseudo->key. " has been associated to admin account"
-    }
-}
-
diff --git a/smeserver-mini-qmail.spec b/smeserver-mini-qmail.spec
index 8560329..244a4ba 100644
--- a/smeserver-mini-qmail.spec
+++ b/smeserver-mini-qmail.spec
@@ -4,7 +4,7 @@ Summary: startup scripts for Dan Bernstein's qmail package
 %define name smeserver-mini-qmail
 Name: %{name}
 %define version 11.0.1
-%define release 2
+%define release 3
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -18,7 +18,7 @@ Requires: mini-qmail
 Obsoletes: qmail
 Requires: dot-forward   
 Requires: fastforward
-Requires: smeserver-email
+Requires: smeserver-email 
 Provides: smeserver-mta
 Provides: e-smith-mta
 Obsoletes: qmail-initscripts
@@ -29,6 +29,9 @@ Provides: e-smith-qmail
 AutoReqProv: no
 
 %changelog
+* Mon Dec 30 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.1-3.sme
+- move action pseudonym-cleanup and migrate 10AdminEmail to smeserver-email [SME: 12808]
+
 * Tue Dec 03 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.1-2.sme
 - initial release of smeserver-mini-qmail from former smeserver-qmail [SME: 12793]
   . only for final delivery or forward behind qpsmtpd and postfix