Initial out of the box functionality changes.

5 files changed, 93 insertions, 2 deletions

diff --git a/packages/postfix/files/.mtn2git_empty b/packages/postfix/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/postfix/files/.mtn2git_empty
diff --git a/packages/postfix/files/main.cf_2.0 b/packages/postfix/files/main.cf_2.0
new file mode 100644
index 0000000000..0bfe4afc1d
--- /dev/null
+++ b/packages/postfix/files/main.cf_2.0
@@ -0,0 +1,25 @@
+mydomain=sample.com
+
+virtual_mailbox_domains = sample.com, other.net
+virtual_mailbox_base = /var/spool/vmail
+virtual_mailbox_maps = hash:/etc/postfix/virtual
+virtual_alias_maps = hash:/etc/postfix/virtual_alias
+virtual_uid_maps = static:vmail
+virtual_gid_maps = static:vmail
+
+config_directory = /etc/postfix
+sample_directory = /etc/postfix
+queue_directory = /var/spool/postfix
+mail_spool_directory = /var/spool/mail
+readme_directory = no
+command_directory = /usr/sbin
+daemon_directory = /usr/libexec/postfix
+mail_owner = postfix
+setgid_group = postdrop
+mydestination =
+unknown_local_recipient_reject_code = 450
+mynetworks_style = host
+debug_peer_level = 2
+sendmail_path = /usr/sbin/sendmail
+newaliases_path = /usr/bin/newaliases
+mailq_path = /usr/bin/mailq
diff --git a/packages/postfix/files/postfix b/packages/postfix/files/postfix
new file mode 100755
index 0000000000..2fd5ba7007
--- /dev/null
+++ b/packages/postfix/files/postfix
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+case "$1" in
+
+        start)
+        echo "Starting Postfix..."
+        postfix start
+        ;;
+
+        stop)
+        echo "Stopping Postfix..."
+        postfix stop
+        ;;
+                
+        reload)
+        echo "Reloading Postfix..."
+        postfix reload
+        ;;
+
+        restart)
+        $0 stop
+        sleep 1
+        $0 start
+        ;;
+
+        *)
+        echo "Usage: $0 {start|stop|reload|restart}"
+        exit 1
+        ;;
+esac
+
diff --git a/packages/postfix/files/volatiles b/packages/postfix/files/volatiles
new file mode 100644
index 0000000000..cb111cd4c0
--- /dev/null
+++ b/packages/postfix/files/volatiles
@@ -0,0 +1,15 @@
+d postfix nogroup 2755 /var/spool/mail
+d root postfix 0755 /var/spool/postfix
+d postfix root 0700 /var/spool/postfix/active
+d postfix root 0700 /var/spool/postfix/bounce
+d postfix root 0700 /var/spool/postfix/corrupt
+d postfix root 0700 /var/spool/postfix/defer
+d postfix root 0700 /var/spool/postfix/deferred
+d postfix root 0700 /var/spool/postfix/flush
+d postfix root 0700 /var/spool/postfix/hold
+d postfix root 0700 /var/spool/postfix/incoming
+d postfix postdrop 0730 /var/spool/postfix/maildrop
+d root root 0755 /var/spool/postfix/pid
+d postfix root 0700 /var/spool/postfix/private
+d postfix postdrop 0710 /var/spool/postfix/public
+d root root 0755 /var/spool/vmail
diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb
index b9ef1fc2a5..25a030f597 100644
--- a/packages/postfix/postfix_2.0.20.bb
+++ b/packages/postfix/postfix_2.0.20.bb
@@ -1,11 +1,23 @@
 SECTION = "console/network"
 DEPENDS = "db3 pcre postfix-native"
 LICENSE = "IPL"
+PR = "r1"
+
 SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \
 	   file://${FILESDIR}/makedefs.patch;patch=1 \
-	   file://${FILESDIR}/install.patch;patch=1"
+	   file://${FILESDIR}/install.patch;patch=1 \
+	   file://main.cf_2.0 \
+	   file://volatiles \
+	   file://postfix \
+	   "
+
 S = "${WORKDIR}/postfix-${PV}"
 
+inherit update-rc.d
+
+INITSCRIPT_NAME = "postfix"
+INITSCRIPT_PARAMS = "start 58 3 4 5 . stop 13 0 1 6 ."
+
 export SYSLIBS = "-lpcre -ldb -lnsl -lresolv ${LDFLAGS}"
 export EXPORT = "AUXLIBS='-lpcre' CCARGS='-DHAS_PCRE ${CFLAGS}' OPT='' DEBUG='-g'"
 export CC_append = " -DHAS_PCRE ${CFLAGS}"
@@ -20,9 +32,17 @@ do_compile () {
 
 do_install () {
 	sh ./postfix-install 'install_root=${D}' -non-interactive
+        mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/sample-main.cf
+	install -m 644 ${WORKDIR}/main.cf_2.0 ${D}${sysconfdir}/postfix/main.cf
+        install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_postfix
+        install -m 755 ${WORKDIR}/postfix ${D}${sysconfdir}/init.d/postfix
 }
 
 pkg_postinst () {
-        grep postfix /etc/passwd || adduser --disabled-password --home=/var/spool/mail --ingroup nogroup postfix
+        grep postfix /etc/group || addgroup postfix
+        grep postdrop /etc/group || addgroup postdrop
+        grep vmail /etc/group || addgroup vmail
+        grep postfix /etc/passwd || adduser --disabled-password --home=/var/spool/postfix --ingroup postfix postfix
+        grep vmail /etc/passwd || adduser --disabled-password --home=/var/spool/vmail --ingroup vmail vmail
 }