From d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 29 Jan 2021 18:03:51 +0000 Subject: gentoo resync : 29.01.2021 --- net-mail/dbmail/Manifest | 11 ++-- net-mail/dbmail/dbmail-3.2.5.ebuild | 96 ++++++++++++++++++++++++++++ net-mail/dbmail/files/README.gentoo | 41 ++++++++++++ net-mail/dbmail/files/dbmail-imapd.initd | 74 ++++++++------------- net-mail/dbmail/files/dbmail-lmtpd.initd | 74 ++++++++------------- net-mail/dbmail/files/dbmail-pop3d.initd | 74 ++++++++------------- net-mail/dbmail/files/dbmail-timsieved.initd | 71 ++++++++------------ 7 files changed, 252 insertions(+), 189 deletions(-) create mode 100644 net-mail/dbmail/dbmail-3.2.5.ebuild create mode 100644 net-mail/dbmail/files/README.gentoo (limited to 'net-mail/dbmail') diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest index c11951e553bd..8fb84d3d1d2d 100644 --- a/net-mail/dbmail/Manifest +++ b/net-mail/dbmail/Manifest @@ -1,8 +1,11 @@ +AUX README.gentoo 1652 BLAKE2B beb9d27ac8de471d4ac8a3c4f626e7005d471477943b424b2603fe9ec92a6910bf0102c472e2d17dc1217d4bd6c286cd50da5d9b5fc6bd23c436cec8c0a84afd SHA512 0af8a295ce85260ca559f6491e8b7e318125b4f424639877a5744d0906023ccbd63c18b59f7fdb60da7994df9c3f62cef10a5db0ee940aa12c2382e33340f0a2 AUX dbmail-3.2.3-fno-common.patch 310 BLAKE2B 1166b001939b200e43b2dd048413e55bd53c9c385f93b40e95ee8306d3386eb365ee30c7ba26c853cc81ca231fd4d4551886f6760697ed40e1cdefd5617ecef3 SHA512 32f2524fdf0e6bf59bc0138d2fb62edad00c6700740fc21281de29dd3b455136bde4072ccf5017425cd417c5408498b688ee453f53166aa80eccba20382d736d -AUX dbmail-imapd.initd 1539 BLAKE2B a05e964172d58063b2fa4addb83c38bca5859e5a092b5672026a7c2641cc5edd63eb2c3b1cad2c8b7ba2ab15e7a7b812417fdec2e01531087b0a8a32bd929b62 SHA512 d7246dd7db8a6e85298cdcd191b525fcd76b3d7526f0c3ad084628651ce54d599fed3313693c8607c79d4ab79580a0bc30f6a0f9e5b814f30d5a4bd92719719d -AUX dbmail-lmtpd.initd 1539 BLAKE2B 6864a82613a8ad4f0cd72322d1383086ebd9f17443ea6534c655e47ce4452cf013a150f3e137df432eb380fb0eb31f05ef0ad6a8c50a076020aefa0b49a9da58 SHA512 5497841698749158c78bf1ef365aabf642370a301bb74b334972ca95d85f16c508cd88d56a41c675f9ad448bc762b5134e09a408ca9d2f40d68abeb83b1ee7d8 -AUX dbmail-pop3d.initd 1539 BLAKE2B 9b74cb310b832bf3cd37bcbb6a25969221792d7694d711e98bfdcb0c9898ce8d68974bd9c221957c7915bc73dba89ac8887961af388c88d44ae1ce17337a0551 SHA512 5968a31db02d6e48adc5ec26527e2ce8fdd0abf78754b911bcb588fa3414598ef0b4dc2ef44220049b015aaa5b0efeaf2be2ff3171562ff82e46d36e2d32d59e -AUX dbmail-timsieved.initd 1554 BLAKE2B b082e00fc491c768fda2afce07bc30c087a7bf927f8cb16e79d60609932fa09e1052acfd39526cb7fb256c5c44cbcdbe6ac94f59f3b12330fe6e51648fa2aae7 SHA512 2340916c1f6abb0ccfbc98f0cd91a042035c0ff6751bee944e6b9227c14bb829152f22763bc87244b6718e4c3df44de6892b1961923a54eef5724ba9befbc34b +AUX dbmail-imapd.initd 867 BLAKE2B 4b9c20f1bc99f13b8c133eee63e78e213debb206bde0f35e361edfe9b6068d1e0c97aad95e1d1743caa554d22fb23f6ebb2fc15adfb093ea9947262cb90d2ba5 SHA512 40fb4197f54c9890884a8b15c56f9eb4ff4d74eca114d678abea156fe9bc404b0860b79da7f4e3cc5d26d0d96dcee91049c28698b5496a3d2e6b7d409bcc9cbd +AUX dbmail-lmtpd.initd 867 BLAKE2B d8829e2b7856d0ccfe6e52aceae59a0811aac70759e4f5f9998e3ed714b235aa0ec3bfa775d3a01ee8b49336f6e20e5fb3eae675d8389fff1862db56f7ed8a0d SHA512 4ced920476580ecfa968c4b0a438b98063aa55a108c2b27b728e76d4c08b58ba5e3295256b5e66f16edd7d247acd2f8bf91262dd49c0a8058dd6132e0473c641 +AUX dbmail-pop3d.initd 867 BLAKE2B 2d24bbe482c28fab0884377bbd47fe7a859313d8c8b20a939692c12942e8dd313067a0304016c8293c5ccce876bbeb533e4bbacfe04f893959821791d7b4d6dd SHA512 e12d73d56fae8852a9926badcb00ae4d83a990d700741bc8ad238bfa302a9f58087efb6e59ee3925230fa001be3004f48fe61e7b17d09cad51a836edc7a15bb2 +AUX dbmail-timsieved.initd 930 BLAKE2B 4eb24e608540d994d75c8aea44aa8128e603fd9c64c4a8205c9581cc521e4a0ca75391796d4a9b369cdcbe74636cdaf55c00408c14b7cc9ec4ad4db307445909 SHA512 7f66fa4b77a638e803f1763809da66bd26f54b435f8e4cff3304d4b4e62d1510485c1af943046489a8c37b3b93a8b6cf4901feefa9f1f38dcdaa313211f19fa0 DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fcb01cb8100cfbd0464f1342f934c099ca52fd857e05fc82b97227155e9dcfc987d6c9b5c37e7daf21b167c9841 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85 +DIST dbmail-3.2.5.tar.gz 2463966 BLAKE2B f4099c6f869dbb041d7eccdf20f3a34d36918237cc0386c71a1d339da8651b9301e676b25201856038045bb9590f880353c6ccafd57330f9cf48382c1b4c603c SHA512 6b0d7e1f6f7449869db1e094ffce9e1ef315c60784ea5ae5f814f2cf9a18c358b4c5d107a420c7317961ffa343fc59c9083789177514aee96523927688f276a0 EBUILD dbmail-3.2.3-r3.ebuild 4000 BLAKE2B c6a5d79374b0a017220f605affd06d37cc09818da99ac763d22cabdb61d4a4f0d8eee014f95fdc8b5680a3de1d7fc22b5f9439dedc7c3b1b446792d4a520c91a SHA512 38bb353cc721ae1a14d0fd9cbc48eb9d2b20798e9ffd52e8eb435e91910eb7cd741ae1497d60f936a11682e6f9c30f9b77f5a8c73b1d184e72e24a22f7db9cf6 +EBUILD dbmail-3.2.5.ebuild 2433 BLAKE2B 59669e7f0eea99372aa739588cbef61d13d336cbc158cfd16125d9cdd6d8d8f66e40967408eb26261d2a8219876282bf4c86b5a57306dcc3880890f7dc4cf273 SHA512 5c8da00d8301ff7135d706a972242b6e0c26f9eeb3c79c435a18ae713e3bbc01c6a781ea7ec823e667d0a4f9c9fea39bfbc6139e566fda0bede6771128abe251 MISC metadata.xml 480 BLAKE2B 09dc565c0e3a53c0072229b6305cbcd4cf9d4927d6b7fba45cf27c772b2d78d96202d685a34d01eb6553c4a228975d8e3c4998c8ad8f7136e34229671b048248 SHA512 0acb11c787a286e0d8020f97d483102b57a323c80f6ed4c95d44a18d162856b3547db96fc92d1649061220cd8b009be44adfed2f7790cbe306662dd525f7a4ef diff --git a/net-mail/dbmail/dbmail-3.2.5.ebuild b/net-mail/dbmail/dbmail-3.2.5.ebuild new file mode 100644 index 000000000000..ab3f44a299a8 --- /dev/null +++ b/net-mail/dbmail/dbmail-3.2.5.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd readme.gentoo-r1 + +DESCRIPTION="Fast and scalable sql based email services" +HOMEPAGE="https://www.dbmail.org/" +SRC_URI="https://github.com/dbmail/dbmail/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+doc jemalloc ldap libressl sieve ssl static systemd" + +DEPEND="dev-db/libzdb + sieve? ( >=mail-filter/libsieve-2.2.1 ) + ldap? ( >=net-nds/openldap-2.3.33 ) + jemalloc? ( dev-libs/jemalloc ) + app-text/asciidoc + app-text/xmlto + app-crypt/mhash + sys-libs/zlib + dev-libs/gmime:2.6 + >=dev-libs/glib-2.16 + dev-libs/libevent + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + )" +RDEPEND="${DEPEND} + acct-group/dbmail + acct-user/dbmail" +DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING ) + +README_GENTOO_SUFFIX="" + +src_prepare() { + sed -i -e "s:nobody:dbmail: ; s:nogroup:dbmail: ; s:/var/run:/run/dbmail:" dbmail.conf || die + # change config path to our default and use the conf.d and init.d files from the contrib dir + sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail || die + + default +} + +src_configure() { + econf \ + --enable-manpages \ + --sysconfdir=/etc/dbmail \ + $(use_enable doc manpages) \ + $(use_enable static) \ + $(use_enable systemd) \ + $(use_with jemalloc) \ + $(use_with sieve) \ + $(use_with ldap auth-ldap) +} + +src_install() { + emake DESTDIR="${D}" SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install + einstalldocs + + docompress -x /usr/share/doc/${PF}/sql + dodoc -r sql + dodoc -r test-scripts + dodoc -r contrib + ## TODO: install other contrib stuff + + insinto /etc/dbmail + newins dbmail.conf dbmail.conf.dist + + # use custom init scripts until updated in upstream contrib + newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd + newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd + newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d + newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved + + dobin contrib/mailbox2dbmail/mailbox2dbmail + doman contrib/mailbox2dbmail/mailbox2dbmail.1 + + # ldap schema + if use ldap; then + insinto /etc/openldap/schema + doins "${S}/dbmail.schema" + fi + + keepdir /var/lib/dbmail + fperms 750 /var/lib/dbmail + fowners dbmail:dbmail /var/lib/dbmail + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-mail/dbmail/files/README.gentoo b/net-mail/dbmail/files/README.gentoo new file mode 100644 index 000000000000..b7e052261a91 --- /dev/null +++ b/net-mail/dbmail/files/README.gentoo @@ -0,0 +1,41 @@ +Please read the INSTALL file in /usr/share/doc/${PF}/ +for remaining instructions on setting up dbmail users and +for finishing configuration to connect to your MTA and +to connect to your db. + +DBMail requires either SQLite, PostgreSQL or MySQL. +Database schemes can be found in /usr/share/doc/${PF}/ +You will also want to follow the installation instructions +on setting up the maintenance program to delete old messages. +Don't forget to edit /etc/dbmail/dbmail.conf as well. + +For regular maintenance, add this to crontab: +0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1 + +Please make sure to run etc-update. +If you get an error message about plugins not found +please add the library_directory configuration switch to +dbmail.conf and set it to the correct path +(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64) +A sample can be found in dbmail.conf.dist after etc-update. + +We are now using the init script from upstream. +Please edit /etc/conf.d/dbmail to set which services to start +and delete /etc/init.d/dbmail-* when you are done. (don't +forget to rc-update del dbmail-* first) + +Changed pid directory to /run/dbmail (see +http://www.dbmail.org/mantis/view.php?id=949 for details) + +The database config has changed to support libzdb db URI +Please check the documentation (or Bug #479664) + +The database schema has changed since 3.0.x make sure +to run the migration script + +Please be aware, that the single init-script for all services +has been replaced with seperate init scripts for the individual services. +Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update +and remove dbmail if you want to take advantage of this change. + + diff --git a/net-mail/dbmail/files/dbmail-imapd.initd b/net-mail/dbmail/files/dbmail-imapd.initd index f2e16dff1706..c2925f9ecb0e 100644 --- a/net-mail/dbmail/files/dbmail-imapd.initd +++ b/net-mail/dbmail/files/dbmail-imapd.initd @@ -1,11 +1,5 @@ -#!/sbin/openrc-run +#!/sbin/runscript # -# chkconfig: - 91 35 -# description: Starts and stops dbmail-impad -# - - -PROGRAM=dbmail-imapd BIN_DIR=/usr/sbin PID_DIR=/run/dbmail @@ -18,51 +12,37 @@ CONFIG=/etc/dbmail/dbmail.conf #extra_started_commands="reload" depend() { - need net - # This won't cause a hard failure if neither is installed, however. - use mysql - use pgsql - after mta + need net + use mysql + use pgsql + after mta } -initService() { - # Avoid using root's TMPDIR - unset TMPDIR - - # Check that config file exists. - if [ ! -e $CONFIG ]; then - eerror "Config file not found ($CONFIG)" - eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist" - return 1 - fi - - checkpath -d $PID_DIR -m 750 -o dbmail:dbmail - - RETVAL=0 +checkconfig() { + if [ ! -e "/etc/dbmail/dbmail.conf" ]; then + eerror "You need to create apropriate config" + eerror "in /etc/dbmail/ . Example can be found in /etc/dbmail/dbmail.conf.dist" + return 1 + fi + # Avoid using root's TMPDIR + unset TMPDIR } + start() { - initService - ebegin "Starting DBMail IMAP daemon ($PROGRAM)" - start-stop-daemon --start --quiet \ - --pidfile $PID_DIR/$PROGRAM.$PID \ - --exec $BIN_DIR/$PROGRAM \ - --name $PROGRAM \ - -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1 - eend $? -} + checkconfig && \ + ebegin "Starting DBMail IMAP daemon" + start-stop-daemon --start --quiet \ + --exec /usr/sbin/dbmail-imapd \ + --name dbmail-imapd \ + -- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1 + eend $? +} stop() { - ebegin "Stopping DBMail IMAP daemon ($PROGRAM)" - start-stop-daemon --stop --quiet --retry 15 \ - --pidfile $PID_DIR/$PROGRAM.$PID - eend $? -} + ebegin "Stopping DBMail IMAP daemon" + start-stop-daemon --stop --quiet --retry 5 \ + --pidfile ${PIDFILE} + eend $? +} -## not in 3.1.x yet -#reload() {# -# ebegin "Reloading DBMail IMAP daemon ($PROGRAM)" -# start-stop-daemon --quiet --signal HUP \ -# --pidfile $PID_DIR/$PROGRAM.$PID -# eend $? -#} diff --git a/net-mail/dbmail/files/dbmail-lmtpd.initd b/net-mail/dbmail/files/dbmail-lmtpd.initd index 7062098fb7b7..083d0e6b8a8c 100644 --- a/net-mail/dbmail/files/dbmail-lmtpd.initd +++ b/net-mail/dbmail/files/dbmail-lmtpd.initd @@ -1,11 +1,5 @@ -#!/sbin/openrc-run +#!/sbin/runscript # -# chkconfig: - 91 35 -# description: Starts and stops dbmail-lmtpd -# - - -PROGRAM=dbmail-lmtpd BIN_DIR=/usr/sbin PID_DIR=/run/dbmail @@ -18,51 +12,37 @@ CONFIG=/etc/dbmail/dbmail.conf #extra_started_commands="reload" depend() { - need net - # This won't cause a hard failure if neither is installed, however. - use mysql - use pgsql - after mta + need net + use mysql + use pgsql + after mta } -initService() { - # Avoid using root's TMPDIR - unset TMPDIR - - # Check that config file exists. - if [ ! -e $CONFIG ]; then - eerror "Config file not found ($CONFIG)" - eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist" - return 1 - fi - - checkpath -d $PID_DIR -m 750 -o dbmail:dbmail - - RETVAL=0 +checkconfig() { + if [ ! -e "/etc/dbmail/dbmail.conf" ]; then + eerror "You need to create apropriate config" + eerror "in /etc/dbmail/ . Example can be found in /etc/dbmail/dbmail.conf.dist" + return 1 + fi + # Avoid using root's TMPDIR + unset TMPDIR } + start() { - initService - ebegin "Starting DBMail LMTP daemon ($PROGRAM)" - start-stop-daemon --start --quiet \ - --pidfile $PID_DIR/$PROGRAM.$PID \ - --exec $BIN_DIR/$PROGRAM \ - --name $PROGRAM \ - -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1 - eend $? -} + checkconfig && \ + ebegin "Starting DBMail LMTP daemon" + start-stop-daemon --start --quiet \ + --exec /usr/sbin/dbmail-lmtpd \ + --name dbmail-lmtpd \ + -- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1 + eend $? +} stop() { - ebegin "Stopping DBMail LMTP daemon ($PROGRAM)" - start-stop-daemon --stop --quiet --retry 15 \ - --pidfile $PID_DIR/$PROGRAM.$PID - eend $? -} + ebegin "Stopping DBMail LMTP daemon" + start-stop-daemon --stop --quiet --retry 5 \ + --pidfile ${PIDFILE} + eend $? +} -## not in 3.1.x yet -#reload() {# -# ebegin "Reloading DBMail LMTP daemon ($PROGRAM)" -# start-stop-daemon --quiet --signal HUP \ -# --pidfile $PID_DIR/$PROGRAM.$PID -# eend $? -#} diff --git a/net-mail/dbmail/files/dbmail-pop3d.initd b/net-mail/dbmail/files/dbmail-pop3d.initd index 156c030be37b..16c4d371f2ec 100644 --- a/net-mail/dbmail/files/dbmail-pop3d.initd +++ b/net-mail/dbmail/files/dbmail-pop3d.initd @@ -1,11 +1,5 @@ -#!/sbin/openrc-run +#!/sbin/runscript # -# chkconfig: - 91 35 -# description: Starts and stops dbmail-pop3d -# - - -PROGRAM=dbmail-pop3d BIN_DIR=/usr/sbin PID_DIR=/run/dbmail @@ -18,51 +12,37 @@ CONFIG=/etc/dbmail/dbmail.conf #extra_started_commands="reload" depend() { - need net - # This won't cause a hard failure if neither is installed, however. - use mysql - use pgsql - after mta + need net + use mysql + use pgsql + after mta } -initService() { - # Avoid using root's TMPDIR - unset TMPDIR - - # Check that config file exists. - if [ ! -e $CONFIG ]; then - eerror "Config file not found ($CONFIG)" - eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist" - return 1 - fi - - checkpath -d $PID_DIR -m 750 -o dbmail:dbmail - - RETVAL=0 +checkconfig() { + if [ ! -e "/etc/dbmail/dbmail.conf" ]; then + eerror "You need to create apropriate config" + eerror "in /etc/dbmail/ . Example can be found in /etc/dbmail/dbmail.conf.dist" + return 1 + fi + # Avoid using root's TMPDIR + unset TMPDIR } + start() { - initService - ebegin "Starting DBMail POP3 daemon ($PROGRAM)" - start-stop-daemon --start --quiet \ - --pidfile $PID_DIR/$PROGRAM.$PID \ - --exec $BIN_DIR/$PROGRAM \ - --name $PROGRAM \ - -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1 - eend $? -} + checkconfig && \ + ebegin "Starting DBMail POP3 daemon" + start-stop-daemon --start --quiet \ + --exec /usr/sbin/dbmail-pop3d \ + --name dbmail-pop3d \ + -- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1 + eend $? +} stop() { - ebegin "Stopping DBMail POP3 daemon ($PROGRAM)" - start-stop-daemon --stop --quiet --retry 15 \ - --pidfile $PID_DIR/$PROGRAM.$PID - eend $? -} + ebegin "Stopping DBMail POP3 daemon" + start-stop-daemon --stop --quiet --retry 5 \ + --pidfile ${PIDFILE} + eend $? +} -## not in 3.1.x yet -#reload() {# -# ebegin "Reloading DBMail POP3 daemon ($PROGRAM)" -# start-stop-daemon --quiet --signal HUP \ -# --pidfile $PID_DIR/$PROGRAM.$PID -# eend $? -#} diff --git a/net-mail/dbmail/files/dbmail-timsieved.initd b/net-mail/dbmail/files/dbmail-timsieved.initd index c5402bdf876e..657bfd586663 100644 --- a/net-mail/dbmail/files/dbmail-timsieved.initd +++ b/net-mail/dbmail/files/dbmail-timsieved.initd @@ -1,10 +1,9 @@ -#!/sbin/openrc-run +#!/sbin/runscript # # chkconfig: - 91 35 # description: Starts and stops dbmail-timsieved # - PROGRAM=dbmail-timsieved BIN_DIR=/usr/sbin @@ -14,55 +13,39 @@ PID=pid # Where is the dbmail.conf file located? CONFIG=/etc/dbmail/dbmail.conf -## not in 3.1.x yet -#extra_started_commands="reload" +PIDFILE="/run/dbmail-timsieved.pid" depend() { - need net - # This won't cause a hard failure if neither is installed, however. - use mysql - use pgsql - after mta + need net + use mysql + use pgsql + after mta } -initService() { - # Avoid using root's TMPDIR - unset TMPDIR - - # Check that config file exists. - if [ ! -e $CONFIG ]; then - eerror "Config file not found ($CONFIG)" - eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist" - return 1 - fi - - checkpath -d $PID_DIR -m 750 -o dbmail:dbmail - - RETVAL=0 +checkconfig() { + if [ ! -e "/etc/dbmail/dbmail.conf" ]; then + eerror "You need to create apropriate config" + eerror "in /etc/dbmail/ . Example can be found in /etc/dbmail/dbmail.conf.dist" + return 1 + fi + # Avoid using root's TMPDIR + unset TMPDIR } + start() { - initService - ebegin "Starting DBMail SIEVE daemon ($PROGRAM)" - start-stop-daemon --start --quiet \ - --pidfile $PID_DIR/$PROGRAM.$PID \ - --exec $BIN_DIR/$PROGRAM \ - --name $PROGRAM \ - -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1 - eend $? -} + checkconfig && \ + ebegin "Starting DBMail SIEVE daemon" + start-stop-daemon --start --quiet \ + --exec /usr/sbin/dbmail-timsieved \ + -- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1 + eend $? +} stop() { - ebegin "Stopping DBMail SIEVE daemon ($PROGRAM)" - start-stop-daemon --stop --quiet --retry 15 \ - --pidfile $PID_DIR/$PROGRAM.$PID - eend $? -} + ebegin "Stopping DBMail SIEVE daemon" + start-stop-daemon --stop --quiet --retry 5 \ + --pidfile ${PIDFILE} + eend $? +} -## not in 3.1.x yet -#reload() {# -# ebegin "Reloading DBMail SIEVE daemon ($PROGRAM)" -# start-stop-daemon --quiet --signal HUP \ -# --pidfile $PID_DIR/$PROGRAM.$PID -# eend $? -#} -- cgit v1.2.3