diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-addlist mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-addlist
--- smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-addlist	2005-10-25 09:50:42.000000000 +1000
+++ mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-addlist	2005-10-25 10:00:46.337532976 +1000
@@ -34,7 +34,7 @@
 tie %conf, 'esmith::config';
 
 my %accounts;
-tie %accounts, 'esmith::config', '/home/e-smith/accounts';
+tie %accounts, 'esmith::config', '/home/e-smith/db/accounts';
 
 my $listName = $ARGV [1];
 my $domain = $ARGV [2];
@@ -48,7 +48,7 @@
 
 my $cookedListName = $listName;
 $cookedListName =~ s/\./:/g;
-my $alias = "/opt/mailman/aliases/.qmail-$listName";
+my $alias = "/usr/lib/mailman/aliases/.qmail-$listName";
 
 my %queues = ("", "post",
               "-admin", "admin",
@@ -65,7 +65,7 @@
 while(my ($tail,$que) = each(%queues))
 {
     open(ALIAS, "> $alias$tail") or die "Cannot open $alias. $!\n";
-    print ALIAS "| /var/qmail/bin/preline /opt/mailman/mail/mailman $que $listName\n";
+    print ALIAS "| /var/qmail/bin/preline /usr/lib/mailman/mail/mailman $que $listName\n";
     close ALIAS or die "Cannot close $alias. $!\n";
     chown(41,41,"$alias$tail");
 }
diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-conf mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-conf
--- smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-conf	2005-02-16 15:02:25.000000000 +1100
+++ mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-conf	2005-10-25 09:59:39.517954322 +1000
@@ -12,16 +12,16 @@
 use warnings;
 use esmith::templates;
 
-my $outfile = '/opt/mailman/Mailman/mm_cfg.py';
+my $outfile = '/usr/lib/mailman/Mailman/mm_cfg.py';
 
 esmith::templates::processTemplate({
     TEMPLATE_PATH => $outfile
     });
 
 # If this is a new install, call post-install to set things up.
-unless ( -d '/opt/mailman/lists/mailman' )
+unless ( -d '/usr/lib/mailman/lists/mailman' )
 {
-    system('/opt/mailman/bin/post-install');
+    system('/usr/lib/mailman/bin/post-install');
 }
 
 exit 0;
diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-rmlist mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-rmlist
--- smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-rmlist	2005-02-14 12:52:31.000000000 +1100
+++ mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-rmlist	2005-10-25 10:00:46.337532976 +1000
@@ -34,7 +34,7 @@
 tie %conf, 'esmith::config';
 
 my %accounts;
-tie %accounts, 'esmith::config', '/home/e-smith/accounts';
+tie %accounts, 'esmith::config', '/home/e-smith/db/accounts';
 
 my $listName = $ARGV [1];
 
@@ -43,7 +43,7 @@
 my $listStatus = db_get_type(\%accounts, $listName);
 db_delete(\%accounts, $listName) if ($listStatus && $listStatus eq "mailmanlist");
 
-my $alias = "/opt/mailman/aliases/.qmail-$listName";
+my $alias = "/usr/lib/mailman/aliases/.qmail-$listName";
 
 my %queues = ("", "post",
               "-admin", "admin",
diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86mailmanAlias mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86mailmanAlias
--- smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86mailmanAlias	2005-02-14 12:52:31.000000000 +1100
+++ mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86mailmanAlias	2005-10-25 09:59:39.517954322 +1000
@@ -1,4 +1,4 @@
-Alias /mailman/public /opt/mailman/archives/public
-ScriptAlias /mailman /opt/mailman/cgi-bin
+Alias /mailman/public /usr/lib/mailman/archives/public
+ScriptAlias /mailman /usr/lib/mailman/cgi-bin
 RedirectMatch ^/mailman[/]*$ /mailman/listinfo
 
diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess90mailman mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess90mailman
--- smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess90mailman	2005-02-14 12:52:31.000000000 +1100
+++ mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess90mailman	2005-10-25 09:59:39.517954322 +1000
@@ -2,7 +2,7 @@
 # mailman directories
 #------------------------------------------------------------
 
-<Directory /opt/mailman/cgi-bin>
+<Directory /usr/lib/mailman/cgi-bin>
     Options ExecCGI
     AllowOverride None
     order deny,allow
@@ -10,7 +10,7 @@
     allow from all
 </Directory>
 
-<Directory /opt/mailman/archives/public>
+<Directory /usr/lib/mailman/archives/public>
     Options Indexes Includes FollowSymLinks
     order deny,allow
     deny from all
diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/etc/e-smith/templates/opt/mailman/Mailman/mm_cfg.py/40archiver mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/opt/mailman/Mailman/mm_cfg.py/40archiver
--- smeserver-mailman-1.3.0/root/etc/e-smith/templates/opt/mailman/Mailman/mm_cfg.py/40archiver	2005-02-14 12:52:31.000000000 +1100
+++ mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/opt/mailman/Mailman/mm_cfg.py/40archiver	2005-10-25 09:59:39.517954322 +1000
@@ -1,11 +1,11 @@
 {
     $OUT = "";
-    if( -x "/opt/mailman/mhonarc/filter")
+    if( -x "/usr/lib/mailman/mhonarc/filter")
     {
-        $OUT .= "PUBLIC_EXTERNAL_ARCHIVER = '/opt/mailman/mhonarc/filter %(listname)s'\n";
-        $OUT .= "PRIVATE_EXTERNAL_ARCHIVER = '/opt/mailman/mhonarc/filter %(listname)s'\n";
-        $OUT .= "PUBLIC_EXTERNAL_ARCHIVER = '/opt/mailman/mhonarc/filter %(listname)s'\n";
-        $OUT .= "PRIVATE_EXTERNAL_ARCHIVER = '/opt/mailman/mhonarc/filter %(listname)s'\n";
+        $OUT .= "PUBLIC_EXTERNAL_ARCHIVER = '/usr/lib/mailman/mhonarc/filter %(listname)s'\n";
+        $OUT .= "PRIVATE_EXTERNAL_ARCHIVER = '/usr/lib/mailman/mhonarc/filter %(listname)s'\n";
+        $OUT .= "PUBLIC_EXTERNAL_ARCHIVER = '/usr/lib/mailman/mhonarc/filter %(listname)s'\n";
+        $OUT .= "PRIVATE_EXTERNAL_ARCHIVER = '/usr/lib/mailman/mhonarc/filter %(listname)s'\n";
     }
     else
     {
diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/etc/e-smith/templates/var/qmail/users/assign/90mailmanlists mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/var/qmail/users/assign/90mailmanlists
--- smeserver-mailman-1.3.0/root/etc/e-smith/templates/var/qmail/users/assign/90mailmanlists	2005-02-14 12:52:31.000000000 +1100
+++ mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/var/qmail/users/assign/90mailmanlists	2005-10-25 10:00:46.337532976 +1000
@@ -8,7 +8,7 @@
     # by ~mailman/aliases/.qmail-listname and ~mailman/aliases/.qmail-listname-ext.
 
     my %accounts;
-    tie %accounts, 'esmith::config', "/home/e-smith/accounts";
+    tie %accounts, 'esmith::config', "/home/e-smith/db/accounts";
 
     my (undef, undef, $uid, $gid, undef, undef, undef, $dir, undef)
 	= getpwnam("mailman");
diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/opt/mailman/bin/post-install mezzanine_patched_smeserver-mailman-1.3.0/root/opt/mailman/bin/post-install
--- smeserver-mailman-1.3.0/root/opt/mailman/bin/post-install	2005-10-25 09:50:42.000000000 +1000
+++ mezzanine_patched_smeserver-mailman-1.3.0/root/opt/mailman/bin/post-install	1970-01-01 10:00:00.000000000 +1000
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-echo " "
-DOMAIN=`/sbin/e-smith/config get DomainName`
-if [ ! -d /opt/mailman/lists/mailman ]; then
-    MATRIX="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-    LENGTH="8"
-    while [ "${n:=1}" -le "$LENGTH" ]; do 
-        PASS="$PASS${MATRIX:$(($RANDOM%${#MATRIX})):1}"
-        let n+=1
-    done
-    echo "* New site password: $PASS"
-    /sbin/e-smith/config setprop mailman SitePass $PASS
-
-    /opt/mailman/bin/mmsitepass "$PASS" > /dev/null 2>&1 || :
-    /opt/mailman/bin/newlist -q mailman admin@${DOMAIN} dummypass > /dev/null 2>&1 || :
-    cat > /tmp/hide << EOF
-advertised = 0
-archive_private = 1
-description = 'Mailman Mailing List'
-EOF
-    /opt/mailman/bin/config_list -i /tmp/hide mailman > /dev/null 2>&1 || :
-    rm -f /tmp/hide
-    echo -n "* "
-    /opt/mailman/bin/change_pw -l mailman 2> /dev/null || echo "New mailman password: *UNCHANGED*"; :
-    "/opt/mailman/bin/add_members -r - -a n mailman << EOF
-    admin@${DOMAIN}
-EOF" > /dev/null 2>&1 || :
-else
-    /etc/e-smith/events/actions/email-assign || :
-fi
-/etc/e-smith/events/actions/conf-httpd mailman-install
-/etc/e-smith/events/actions/restart-httpd-graceful
diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/opt/mailman/bin/smelist mezzanine_patched_smeserver-mailman-1.3.0/root/opt/mailman/bin/smelist
--- smeserver-mailman-1.3.0/root/opt/mailman/bin/smelist	2005-02-14 12:52:31.000000000 +1100
+++ mezzanine_patched_smeserver-mailman-1.3.0/root/opt/mailman/bin/smelist	1970-01-01 10:00:00.000000000 +1000
@@ -1,23 +0,0 @@
-#!/usr/bin/perl -wT
-
-package esmith;
-use strict;
-use esmith::util;
-
-my $usage = "$0 is not meant to be called from the command line.
-";
-
-my ($event, $list) = @ARGV;
-die $usage unless $event;
-die $usage unless $list;
-
-BEGIN
-{
-    $ENV {'PATH'} = '';
-    $ENV {'SHELL'} = '/bin/bash';
-    delete $ENV {'ENV'};
-}
-
-esmith::util::setRealToEffective ();
-system ("/sbin/e-smith/signal-event", "mailman-$event", "$list") == 0
-    or die ("Error occurred while modifying mailman list $list.\n");
diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/opt/mailman/Mailman/MTA/SME.py mezzanine_patched_smeserver-mailman-1.3.0/root/opt/mailman/Mailman/MTA/SME.py
--- smeserver-mailman-1.3.0/root/opt/mailman/Mailman/MTA/SME.py	2005-02-14 12:52:31.000000000 +1100
+++ mezzanine_patched_smeserver-mailman-1.3.0/root/opt/mailman/Mailman/MTA/SME.py	1970-01-01 10:00:00.000000000 +1000
@@ -1,55 +0,0 @@
-# Copyright (C) 2001,2002 by the Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software 
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-"""Creation/deletion hooks for the SME and Q-Mail
-"""
-
-import os
-import time
-import errno
-import pwd
-from stat import *
-
-from Mailman import mm_cfg
-from Mailman import Utils
-from Mailman import LockFile
-from Mailman.i18n import _
-from Mailman.MTA.Utils import makealiases
-from Mailman.Logging.Syslog import syslog
-
-
-
-def create(mlist, cgi=0, nolock=0):
-    listname = mlist.internal_name()
-    msg = 'command failed: %s (status: %s, %s)'
-    acmd = '/opt/mailman/bin/smelist addlist ' + listname
-    status = (os.system(acmd) >> 8) & 0xff
-    if status:
-        errstr = os.strerror(status)
-        syslog('error', msg, acmd, status, errstr)
-        raise RuntimeError, msg % (acmd, status, errstr)
-
-
-
-def remove(mlist, cgi=0):
-    listname = mlist.internal_name()
-    msg = 'command failed: %s (status: %s, %s)'
-    acmd = '/opt/mailman/bin/smelist rmlist ' + listname
-    status = (os.system(acmd) >> 8) & 0xff
-    if status:
-        errstr = os.strerror(status)
-        syslog('error', msg, acmd, status, errstr)
-        raise RuntimeError, msg % (acmd, status, errstr)
diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/post-install mezzanine_patched_smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/post-install
--- smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/post-install	1970-01-01 10:00:00.000000000 +1000
+++ mezzanine_patched_smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/post-install	2005-10-25 09:59:39.517954322 +1000
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+echo " "
+DOMAIN=`/sbin/e-smith/config get DomainName`
+if [ ! -d /usr/lib/mailman/lists/mailman ]; then
+    MATRIX="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+    LENGTH="8"
+    while [ "${n:=1}" -le "$LENGTH" ]; do 
+        PASS="$PASS${MATRIX:$(($RANDOM%${#MATRIX})):1}"
+        let n+=1
+    done
+    echo "* New site password: $PASS"
+    /sbin/e-smith/config setprop mailman SitePass $PASS
+
+    /usr/lib/mailman/bin/mmsitepass "$PASS" > /dev/null 2>&1 || :
+    /usr/lib/mailman/bin/newlist -q mailman admin@${DOMAIN} dummypass > /dev/null 2>&1 || :
+    cat > /tmp/hide << EOF
+advertised = 0
+archive_private = 1
+description = 'Mailman Mailing List'
+EOF
+    /usr/lib/mailman/bin/config_list -i /tmp/hide mailman > /dev/null 2>&1 || :
+    rm -f /tmp/hide
+    echo -n "* "
+    /usr/lib/mailman/bin/change_pw -l mailman 2> /dev/null || echo "New mailman password: *UNCHANGED*"; :
+    "/usr/lib/mailman/bin/add_members -r - -a n mailman << EOF
+    admin@${DOMAIN}
+EOF" > /dev/null 2>&1 || :
+else
+    /etc/e-smith/events/actions/email-assign || :
+fi
+/etc/e-smith/events/actions/conf-httpd mailman-install
+/etc/e-smith/events/actions/restart-httpd-graceful
diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/smelist mezzanine_patched_smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/smelist
--- smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/smelist	1970-01-01 10:00:00.000000000 +1000
+++ mezzanine_patched_smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/smelist	2005-02-14 12:52:31.000000000 +1100
@@ -0,0 +1,23 @@
+#!/usr/bin/perl -wT
+
+package esmith;
+use strict;
+use esmith::util;
+
+my $usage = "$0 is not meant to be called from the command line.
+";
+
+my ($event, $list) = @ARGV;
+die $usage unless $event;
+die $usage unless $list;
+
+BEGIN
+{
+    $ENV {'PATH'} = '';
+    $ENV {'SHELL'} = '/bin/bash';
+    delete $ENV {'ENV'};
+}
+
+esmith::util::setRealToEffective ();
+system ("/sbin/e-smith/signal-event", "mailman-$event", "$list") == 0
+    or die ("Error occurred while modifying mailman list $list.\n");
diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/usr/lib/mailman/Mailman/MTA/SME.py mezzanine_patched_smeserver-mailman-1.3.0/root/usr/lib/mailman/Mailman/MTA/SME.py
--- smeserver-mailman-1.3.0/root/usr/lib/mailman/Mailman/MTA/SME.py	1970-01-01 10:00:00.000000000 +1000
+++ mezzanine_patched_smeserver-mailman-1.3.0/root/usr/lib/mailman/Mailman/MTA/SME.py	2005-10-25 09:59:39.516954493 +1000
@@ -0,0 +1,55 @@
+# Copyright (C) 2001,2002 by the Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software 
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+"""Creation/deletion hooks for the SME and Q-Mail
+"""
+
+import os
+import time
+import errno
+import pwd
+from stat import *
+
+from Mailman import mm_cfg
+from Mailman import Utils
+from Mailman import LockFile
+from Mailman.i18n import _
+from Mailman.MTA.Utils import makealiases
+from Mailman.Logging.Syslog import syslog
+
+
+
+def create(mlist, cgi=0, nolock=0):
+    listname = mlist.internal_name()
+    msg = 'command failed: %s (status: %s, %s)'
+    acmd = '/usr/lib/mailman/bin/smelist addlist ' + listname
+    status = (os.system(acmd) >> 8) & 0xff
+    if status:
+        errstr = os.strerror(status)
+        syslog('error', msg, acmd, status, errstr)
+        raise RuntimeError, msg % (acmd, status, errstr)
+
+
+
+def remove(mlist, cgi=0):
+    listname = mlist.internal_name()
+    msg = 'command failed: %s (status: %s, %s)'
+    acmd = '/usr/lib/mailman/bin/smelist rmlist ' + listname
+    status = (os.system(acmd) >> 8) & 0xff
+    if status:
+        errstr = os.strerror(status)
+        syslog('error', msg, acmd, status, errstr)
+        raise RuntimeError, msg % (acmd, status, errstr)