summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2004-08-19 14:40:32 +0000
committerJonas Smedegaard <dr@jones.dk>2004-08-19 14:40:32 +0000
commite1905cf3aa9f53f0c61426330e41880bbe90f3e3 (patch)
tree0d569257cd5d2ef867e45a7c62682b66607c8c9c
parentbde2e9d3376052bfca07a449d6635383f4d7b38f (diff)
Add wrapper scripts for localmkpostfixvirtual.
-rwxr-xr-xlocalmaildomainprepare31
-rwxr-xr-xlocalmaildomainupdate35
-rwxr-xr-xlocalmkpostfixvirtual3
3 files changed, 67 insertions, 2 deletions
diff --git a/localmaildomainprepare b/localmaildomainprepare
new file mode 100755
index 0000000..0664e59
--- /dev/null
+++ b/localmaildomainprepare
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# /usr/local/sbin/localmkpostfixvirtual
+# Copyright 2004 Jonas Smedegaard <dr@jones.dk>
+#
+# $Id: localmaildomainprepare,v 1.1 2004-08-19 14:40:32 jonas Exp $
+#
+# Prepare mailuser updates from system user database
+#
+# (wrapper script for localmkpostfixvirtual)
+#
+
+set -e
+
+if [ $# -ge 1 ]; then
+ maildomain="$1"
+ virtualfile="virtual.$1"
+ shift
+else
+ maildomain=""
+ virtualfile="virtual"
+fi
+
+(
+ cd /etc/postfix
+ localmkpostfixvirtual $maildomain > $virtualfile.new
+ if [ -f /etc/postfix/$virtualfile.addon ]; then
+ cat /etc/postfix/$virtualfile.addon >> $virtualfile.new
+ fi
+ diff $@ $virtualfile $virtualfile.new
+)
diff --git a/localmaildomainupdate b/localmaildomainupdate
new file mode 100755
index 0000000..544f0ae
--- /dev/null
+++ b/localmaildomainupdate
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# /usr/local/sbin/localmaildomainupdate
+# Copyright 2004 Jonas Smedegaard <dr@jones.dk>
+#
+# $Id: localmaildomainupdate,v 1.1 2004-08-19 14:40:32 jonas Exp $
+#
+# Update an (already prepared!) mailuser file
+#
+# (wrapper script for localmkpostfixvirtual)
+#
+
+set -e
+
+if [ $# -ge 1 ]; then
+ maildomain="$1"
+ virtualfile="virtual.$1"
+ shift
+else
+ maildomain=""
+ virtualfile="virtual"
+fi
+
+(
+ cd /etc/postfix
+ diff $@ $virtualfile $virtualfile.new
+ echo -n "Above is the intended changes. OK to update (y/N)? "
+ read do_update
+ case $do_update in
+ y|Y)
+ mv $virtualfile.new $virtualfile
+ postmap $virtualfile
+ ;;
+ esac
+)
diff --git a/localmkpostfixvirtual b/localmkpostfixvirtual
index d75c270..aec37b6 100755
--- a/localmkpostfixvirtual
+++ b/localmkpostfixvirtual
@@ -3,7 +3,7 @@
# /usr/local/sbin/localmkpostfixvirtual
# Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk>
#
-# $Id: localmkpostfixvirtual,v 1.16 2004-06-17 01:26:29 jonas Exp $
+# $Id: localmkpostfixvirtual,v 1.17 2004-08-19 14:40:32 jonas Exp $
#
# Generate virtual file for postfix
#
@@ -111,4 +111,3 @@ for gid in $mailgroups; do
done
done
done
-test -f /etc/postfix/virtual.addon && cat /etc/postfix/virtual.addon || true