Package: postfix Followup-For: Bug #715188 User: pkg-systemd-maintain...@lists.alioth.debian.org Usertags: systemd-units
attached is a patch for systemd support using the Fedora .service file -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: armhf (armv7l) Kernel: Linux 3.4.0 (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
>From 12784a28c019a11f9940cf77fc3ed8249c33c036 Mon Sep 17 00:00:00 2001 From: Shawn Landden <shawnland...@gmail.com> Date: Fri, 16 Aug 2013 11:53:06 -0700 Subject: [PATCH] systemd support using dh-systemd --- debian/control | 2 +- debian/init.d | 269 ------------------------------------------------- debian/postfix.init | 269 +++++++++++++++++++++++++++++++++++++++++++++++++ debian/postfix.service | 15 +++ debian/rules | 4 +- 5 files changed, 288 insertions(+), 271 deletions(-) delete mode 100644 debian/init.d create mode 100644 debian/postfix.init create mode 100644 debian/postfix.service diff --git a/debian/control b/debian/control index 550a9b1..12ff44d 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: LaMont Jones <lam...@debian.org> Standards-Version: 3.9.1.0 Homepage: http://www.postfix.org -Build-Depends: debhelper (>= 7), po-debconf (>= 0.5.0), groff-base, patch, lsb-release, libdb-dev (>=4.6.19), libldap2-dev (>=2.1), libpcre3-dev, libmysqlclient-dev|libmysqlclient15-dev|libmysqlclient14-dev, libssl-dev (>=0.9.7), libsasl2-dev, libpq-dev, libcdb-dev, hardening-wrapper, dpkg-dev (>= 1.15.5), libsqlite3-dev +Build-Depends: debhelper (>= 7), po-debconf (>= 0.5.0), groff-base, patch, lsb-release, libdb-dev (>=4.6.19), libldap2-dev (>=2.1), libpcre3-dev, libmysqlclient-dev|libmysqlclient15-dev|libmysqlclient14-dev, libssl-dev (>=0.9.7), libsasl2-dev, libpq-dev, libcdb-dev, hardening-wrapper, dpkg-dev (>= 1.15.5), libsqlite3-dev, dh-systemd Vcs-Browser: http://git.debian.org/?p=users/lamont/postfix.git Vcs-Git: git://git.debian.org/~lamont/postfix.git diff --git a/debian/init.d b/debian/init.d deleted file mode 100644 index 91a2d1b..0000000 --- a/debian/init.d +++ /dev/null @@ -1,269 +0,0 @@ -#!/bin/sh -e - -# Start or stop Postfix -# -# LaMont Jones <lam...@debian.org> -# based on sendmail's init.d script - -### BEGIN INIT INFO -# Provides: postfix mail-transport-agent -# Required-Start: $local_fs $remote_fs $syslog $named $network $time -# Required-Stop: $local_fs $remote_fs $syslog $named $network -# Should-Start: postgresql mysql clamav-daemon postgrey spamassassin saslauthd dovecot -# Should-Stop: postgresql mysql clamav-daemon postgrey spamassassin saslauthd dovecot -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop the Postfix Mail Transport Agent -# Description: postfix is a Mail Transport agent -### END INIT INFO - -PATH=/bin:/usr/bin:/sbin:/usr/sbin -DAEMON=/usr/sbin/postfix -NAME=Postfix -TZ= -unset TZ - -# Defaults - don't touch, edit /etc/default/postfix -SYNC_CHROOT="y" - -test -f /etc/default/postfix && . /etc/default/postfix - -test -x $DAEMON && test -f /etc/postfix/main.cf || exit 0 - -. /lib/lsb/init-functions -#DISTRO=$(lsb_release -is 2>/dev/null || echo Debian) - -enabled_instances() { - postmulti -l -a | awk '($3=="y") { print $1}' -} - -running() { - INSTANCE="$1" - if [ "X$INSTANCE" = X ]; then - POSTCONF="postconf" - else - POSTCONF="postmulti -i $INSTANCE -x postconf" - fi - - queue=$($POSTCONF -h queue_directory 2>/dev/null || echo /var/spool/postfix) - if [ -f ${queue}/pid/master.pid ]; then - pid=$(sed 's/ //g' ${queue}/pid/master.pid) - # what directory does the executable live in. stupid prelink systems. - dir=$(ls -l /proc/$pid/exe 2>/dev/null | sed 's/.* -> //; s/\/[^\/]*$//') - if [ "X$dir" = "X/usr/lib/postfix" ]; then - echo y - fi - fi -} - -configure_instance() { - INSTANCE="$1" - if [ "X$INSTANCE" = X ]; then - POSTCONF="postconf" - else - POSTCONF="postmulti -i $INSTANCE -x postconf" - fi - - - # if you set myorigin to 'ubuntu.com' or 'debian.org', it's wrong, and annoys the admins of - # those domains. See also sender_canonical_maps. - - MYORIGIN=$($POSTCONF -h myorigin | tr 'A-Z' 'a-z') - if [ "X${MYORIGIN#/}" != "X${MYORIGIN}" ]; then - MYORIGIN=$(tr 'A-Z' 'a-z' < $MYORIGIN) - fi - if [ "X$MYORIGIN" = Xubuntu.com ] || [ "X$MYORIGIN" = Xdebian.org ]; then - log_failure_msg "Invalid \$myorigin ($MYORIGIN), refusing to start" - log_end_msg 1 - exit 1 - fi - - config_dir=$($POSTCONF -h config_directory) - # see if anything is running chrooted. - NEED_CHROOT=$(awk '/^[0-9a-z]/ && ($5 ~ "[-yY]") { print "y"; exit}' ${config_dir}/master.cf) - - if [ -n "$NEED_CHROOT" ] && [ -n "$SYNC_CHROOT" ]; then - # Make sure that the chroot environment is set up correctly. - oldumask=$(umask) - umask 022 - queue_dir=$($POSTCONF -h queue_directory) - cd "$queue_dir" - - # copy the CA path if specified - ca_path=$($POSTCONF -h smtp_tls_CApath) - case "$ca_path" in - '') :;; # no ca_path - $queue_dir/*) :;; # skip stuff already in chroot, (and to make vim syntax happy: */) - *) - if test -d "$ca_path"; then - dest_dir="$queue_dir/${ca_path#/}" - # strip any/all trailing / - while [ "${dest_dir%/}" != "${dest_dir}" ]; do - dest_dir="${dest_dir%/}" - done - new=0 - if test -d "$dest_dir"; then - # write to a new directory ... - dest_dir="${dest_dir}.NEW" - new=1 - fi - mkdir --parent ${dest_dir} - # handle files in subdirectories - (cd "$ca_path" && find . -name '*.pem' -print0 | cpio -0pdL --quiet "$dest_dir") 2>/dev/null || - (log_failure_msg failure copying certificates; exit 1) - c_rehash "$dest_dir" >/dev/null 2>&1 - if [ "$new" = 1 ]; then - # and replace the old directory - rm -rf "${dest_dir%.NEW}" - mv "$dest_dir" "${dest_dir%.NEW}" - fi - fi - ;; - esac - - # if there is a CA file, copy it - ca_file=$($POSTCONF -h smtp_tls_CAfile) - case "$ca_file" in - $queue_dir/*) :;; # skip stuff already in chroot - '') # no ca_file - # or copy the bundle to preserve functionality - ca_bundle=/etc/ssl/certs/ca-certificates.crt - if [ -f $ca_bundle ]; then - mkdir --parent "$queue_dir/${ca_bundle%/*}" - cp -L "$ca_bundle" "$queue_dir/${ca_bundle%/*}" - fi - ;; - *) - if test -f "$ca_file"; then - dest_dir="$queue_dir/${ca_path#/}" - mkdir --parent "$dest_dir" - cp -L "$ca_file" "$dest_dir" - fi - ;; - esac - - # if we're using unix:passwd.byname, then we need to add etc/passwd. - local_maps=$($POSTCONF -h local_recipient_maps) - if [ "X$local_maps" != "X${local_maps#*unix:passwd.byname}" ]; then - if [ "X$local_maps" = "X${local_maps#*proxy:unix:passwd.byname}" ]; then - sed 's/^\([^:]*\):[^:]*/\1:x/' /etc/passwd > etc/passwd - chmod a+r etc/passwd - fi - fi - - FILES="etc/localtime etc/services etc/resolv.conf etc/hosts \ - etc/nsswitch.conf etc/nss_mdns.config" - for file in $FILES; do - [ -d ${file%/*} ] || mkdir -p ${file%/*} - if [ -f /${file} ]; then rm -f ${file} && cp /${file} ${file}; fi - if [ -f ${file} ]; then chmod a+rX ${file}; fi - done - # ldaps needs this. debian bug 572841 - (echo /dev/random; echo /dev/urandom) | cpio -pdL --quiet . 2>/dev/null || true - rm -f usr/lib/zoneinfo/localtime - mkdir -p usr/lib/zoneinfo - ln -sf /etc/localtime usr/lib/zoneinfo/localtime - - LIBLIST=$(for name in gcc_s nss resolv; do - for f in /lib/*/lib${name}*.so* /lib/lib${name}*.so*; do - if [ -f "$f" ]; then echo ${f#/}; fi; - done; - done) - - if [ -n "$LIBLIST" ]; then - for f in "$LIBLIST"; do - rm -f "$f" - done - tar cf - -C / $LIBLIST 2>/dev/null |tar xf - - fi - umask $oldumask - fi -} - -case "$1" in - start) - log_daemon_msg "Starting Postfix Mail Transport Agent" postfix - RET=0 - # for all instances that are not already running, handle chroot setup if needed, and start - for INSTANCE in $(enabled_instances); do - RUNNING=$(running $INSTANCE) - if [ "X$RUNNING" = X ]; then - configure_instance $INSTANCE - CMD="/usr/sbin/postmulti -- -i $INSTANCE -x ${DAEMON}" - if ! start-stop-daemon --start --exec $CMD quiet-quick-start; then - RET=1 - fi - fi - done - log_end_msg $RET - ;; - - stop) - log_daemon_msg "Stopping Postfix Mail Transport Agent" postfix - RET=0 - # for all instances that are not already running, handle chroot setup if needed, and start - for INSTANCE in $(enabled_instances); do - RUNNING=$(running $INSTANCE) - if [ "X$RUNNING" != X ]; then - CMD="/usr/sbin/postmulti -i $INSTANCE -x ${DAEMON}" - if ! ${CMD} quiet-stop; then - RET=1 - fi - fi - done - log_end_msg $RET - ;; - - restart) - $0 stop - $0 start - ;; - - force-reload|reload) - log_action_begin_msg "Reloading Postfix configuration" - if ${DAEMON} quiet-reload; then - log_action_end_msg 0 - else - log_action_end_msg 1 - fi - ;; - - status) - ALL=1 - ANY=0 - # for all instances that are not already running, handle chroot setup if needed, and start - for INSTANCE in $(enabled_instances); do - RUNNING=$(running $INSTANCE) - if [ "X$RUNNING" != X ]; then - ANY=1 - else - ALL=0 - fi - done - # handle the case when postmulti returns *no* configured instances - if [ $ANY = 0 ]; then - ALL=0 - fi - if [ $ALL = 1 ]; then - log_success_msg "postfix is running" - exit 0 - elif [ $ANY = 1 ]; then - log_success_msg "some postfix instances are running" - exit 0 - else - log_success_msg "postfix is not running" - exit 3 - fi - ;; - - flush|check|abort) - ${DAEMON} $1 - ;; - - *) - log_action_msg "Usage: /etc/init.d/postfix {start|stop|restart|reload|flush|check|abort|force-reload|status}" - exit 1 - ;; -esac - -exit 0 diff --git a/debian/postfix.init b/debian/postfix.init new file mode 100644 index 0000000..91a2d1b --- /dev/null +++ b/debian/postfix.init @@ -0,0 +1,269 @@ +#!/bin/sh -e + +# Start or stop Postfix +# +# LaMont Jones <lam...@debian.org> +# based on sendmail's init.d script + +### BEGIN INIT INFO +# Provides: postfix mail-transport-agent +# Required-Start: $local_fs $remote_fs $syslog $named $network $time +# Required-Stop: $local_fs $remote_fs $syslog $named $network +# Should-Start: postgresql mysql clamav-daemon postgrey spamassassin saslauthd dovecot +# Should-Stop: postgresql mysql clamav-daemon postgrey spamassassin saslauthd dovecot +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: start and stop the Postfix Mail Transport Agent +# Description: postfix is a Mail Transport agent +### END INIT INFO + +PATH=/bin:/usr/bin:/sbin:/usr/sbin +DAEMON=/usr/sbin/postfix +NAME=Postfix +TZ= +unset TZ + +# Defaults - don't touch, edit /etc/default/postfix +SYNC_CHROOT="y" + +test -f /etc/default/postfix && . /etc/default/postfix + +test -x $DAEMON && test -f /etc/postfix/main.cf || exit 0 + +. /lib/lsb/init-functions +#DISTRO=$(lsb_release -is 2>/dev/null || echo Debian) + +enabled_instances() { + postmulti -l -a | awk '($3=="y") { print $1}' +} + +running() { + INSTANCE="$1" + if [ "X$INSTANCE" = X ]; then + POSTCONF="postconf" + else + POSTCONF="postmulti -i $INSTANCE -x postconf" + fi + + queue=$($POSTCONF -h queue_directory 2>/dev/null || echo /var/spool/postfix) + if [ -f ${queue}/pid/master.pid ]; then + pid=$(sed 's/ //g' ${queue}/pid/master.pid) + # what directory does the executable live in. stupid prelink systems. + dir=$(ls -l /proc/$pid/exe 2>/dev/null | sed 's/.* -> //; s/\/[^\/]*$//') + if [ "X$dir" = "X/usr/lib/postfix" ]; then + echo y + fi + fi +} + +configure_instance() { + INSTANCE="$1" + if [ "X$INSTANCE" = X ]; then + POSTCONF="postconf" + else + POSTCONF="postmulti -i $INSTANCE -x postconf" + fi + + + # if you set myorigin to 'ubuntu.com' or 'debian.org', it's wrong, and annoys the admins of + # those domains. See also sender_canonical_maps. + + MYORIGIN=$($POSTCONF -h myorigin | tr 'A-Z' 'a-z') + if [ "X${MYORIGIN#/}" != "X${MYORIGIN}" ]; then + MYORIGIN=$(tr 'A-Z' 'a-z' < $MYORIGIN) + fi + if [ "X$MYORIGIN" = Xubuntu.com ] || [ "X$MYORIGIN" = Xdebian.org ]; then + log_failure_msg "Invalid \$myorigin ($MYORIGIN), refusing to start" + log_end_msg 1 + exit 1 + fi + + config_dir=$($POSTCONF -h config_directory) + # see if anything is running chrooted. + NEED_CHROOT=$(awk '/^[0-9a-z]/ && ($5 ~ "[-yY]") { print "y"; exit}' ${config_dir}/master.cf) + + if [ -n "$NEED_CHROOT" ] && [ -n "$SYNC_CHROOT" ]; then + # Make sure that the chroot environment is set up correctly. + oldumask=$(umask) + umask 022 + queue_dir=$($POSTCONF -h queue_directory) + cd "$queue_dir" + + # copy the CA path if specified + ca_path=$($POSTCONF -h smtp_tls_CApath) + case "$ca_path" in + '') :;; # no ca_path + $queue_dir/*) :;; # skip stuff already in chroot, (and to make vim syntax happy: */) + *) + if test -d "$ca_path"; then + dest_dir="$queue_dir/${ca_path#/}" + # strip any/all trailing / + while [ "${dest_dir%/}" != "${dest_dir}" ]; do + dest_dir="${dest_dir%/}" + done + new=0 + if test -d "$dest_dir"; then + # write to a new directory ... + dest_dir="${dest_dir}.NEW" + new=1 + fi + mkdir --parent ${dest_dir} + # handle files in subdirectories + (cd "$ca_path" && find . -name '*.pem' -print0 | cpio -0pdL --quiet "$dest_dir") 2>/dev/null || + (log_failure_msg failure copying certificates; exit 1) + c_rehash "$dest_dir" >/dev/null 2>&1 + if [ "$new" = 1 ]; then + # and replace the old directory + rm -rf "${dest_dir%.NEW}" + mv "$dest_dir" "${dest_dir%.NEW}" + fi + fi + ;; + esac + + # if there is a CA file, copy it + ca_file=$($POSTCONF -h smtp_tls_CAfile) + case "$ca_file" in + $queue_dir/*) :;; # skip stuff already in chroot + '') # no ca_file + # or copy the bundle to preserve functionality + ca_bundle=/etc/ssl/certs/ca-certificates.crt + if [ -f $ca_bundle ]; then + mkdir --parent "$queue_dir/${ca_bundle%/*}" + cp -L "$ca_bundle" "$queue_dir/${ca_bundle%/*}" + fi + ;; + *) + if test -f "$ca_file"; then + dest_dir="$queue_dir/${ca_path#/}" + mkdir --parent "$dest_dir" + cp -L "$ca_file" "$dest_dir" + fi + ;; + esac + + # if we're using unix:passwd.byname, then we need to add etc/passwd. + local_maps=$($POSTCONF -h local_recipient_maps) + if [ "X$local_maps" != "X${local_maps#*unix:passwd.byname}" ]; then + if [ "X$local_maps" = "X${local_maps#*proxy:unix:passwd.byname}" ]; then + sed 's/^\([^:]*\):[^:]*/\1:x/' /etc/passwd > etc/passwd + chmod a+r etc/passwd + fi + fi + + FILES="etc/localtime etc/services etc/resolv.conf etc/hosts \ + etc/nsswitch.conf etc/nss_mdns.config" + for file in $FILES; do + [ -d ${file%/*} ] || mkdir -p ${file%/*} + if [ -f /${file} ]; then rm -f ${file} && cp /${file} ${file}; fi + if [ -f ${file} ]; then chmod a+rX ${file}; fi + done + # ldaps needs this. debian bug 572841 + (echo /dev/random; echo /dev/urandom) | cpio -pdL --quiet . 2>/dev/null || true + rm -f usr/lib/zoneinfo/localtime + mkdir -p usr/lib/zoneinfo + ln -sf /etc/localtime usr/lib/zoneinfo/localtime + + LIBLIST=$(for name in gcc_s nss resolv; do + for f in /lib/*/lib${name}*.so* /lib/lib${name}*.so*; do + if [ -f "$f" ]; then echo ${f#/}; fi; + done; + done) + + if [ -n "$LIBLIST" ]; then + for f in "$LIBLIST"; do + rm -f "$f" + done + tar cf - -C / $LIBLIST 2>/dev/null |tar xf - + fi + umask $oldumask + fi +} + +case "$1" in + start) + log_daemon_msg "Starting Postfix Mail Transport Agent" postfix + RET=0 + # for all instances that are not already running, handle chroot setup if needed, and start + for INSTANCE in $(enabled_instances); do + RUNNING=$(running $INSTANCE) + if [ "X$RUNNING" = X ]; then + configure_instance $INSTANCE + CMD="/usr/sbin/postmulti -- -i $INSTANCE -x ${DAEMON}" + if ! start-stop-daemon --start --exec $CMD quiet-quick-start; then + RET=1 + fi + fi + done + log_end_msg $RET + ;; + + stop) + log_daemon_msg "Stopping Postfix Mail Transport Agent" postfix + RET=0 + # for all instances that are not already running, handle chroot setup if needed, and start + for INSTANCE in $(enabled_instances); do + RUNNING=$(running $INSTANCE) + if [ "X$RUNNING" != X ]; then + CMD="/usr/sbin/postmulti -i $INSTANCE -x ${DAEMON}" + if ! ${CMD} quiet-stop; then + RET=1 + fi + fi + done + log_end_msg $RET + ;; + + restart) + $0 stop + $0 start + ;; + + force-reload|reload) + log_action_begin_msg "Reloading Postfix configuration" + if ${DAEMON} quiet-reload; then + log_action_end_msg 0 + else + log_action_end_msg 1 + fi + ;; + + status) + ALL=1 + ANY=0 + # for all instances that are not already running, handle chroot setup if needed, and start + for INSTANCE in $(enabled_instances); do + RUNNING=$(running $INSTANCE) + if [ "X$RUNNING" != X ]; then + ANY=1 + else + ALL=0 + fi + done + # handle the case when postmulti returns *no* configured instances + if [ $ANY = 0 ]; then + ALL=0 + fi + if [ $ALL = 1 ]; then + log_success_msg "postfix is running" + exit 0 + elif [ $ANY = 1 ]; then + log_success_msg "some postfix instances are running" + exit 0 + else + log_success_msg "postfix is not running" + exit 3 + fi + ;; + + flush|check|abort) + ${DAEMON} $1 + ;; + + *) + log_action_msg "Usage: /etc/init.d/postfix {start|stop|restart|reload|flush|check|abort|force-reload|status}" + exit 1 + ;; +esac + +exit 0 diff --git a/debian/postfix.service b/debian/postfix.service new file mode 100644 index 0000000..1b3dde9 --- /dev/null +++ b/debian/postfix.service @@ -0,0 +1,15 @@ +[Unit] +Description=Postfix Mail Transport Agent +After=syslog.target network.target +Conflicts=sendmail.service exim.service + +[Service] +Type=forking +PIDFile=/var/spool/postfix/pid/master.pid +ExecStart=/usr/sbin/postfix start +ExecReload=/usr/sbin/postfix reload +ExecStop=/usr/sbin/postfix stop + +[Install] +WantedBy=multi-user.target + diff --git a/debian/rules b/debian/rules index fb28cb6..af1942b 100755 --- a/debian/rules +++ b/debian/rules @@ -149,7 +149,9 @@ install: build ln -sf bounce.8postfix.gz ${base}/usr/share/man/man8/trace.8postfix.gz ln -sf bounce.8postfix.gz ${base}/usr/share/man/man8/defer.8postfix.gz - install debian/init.d ${base}/etc/init.d/postfix + dh_systemd_enable + dh_installinit + dh_systemd_start install debian/ip-up.d ${base}/etc/ppp/ip-up.d/postfix install debian/ip-down.d ${base}/etc/ppp/ip-down.d/postfix install debian/ip-up.d ${base}/etc/network/if-up.d/postfix -- 1.8.4.rc2
