diff options
| author | Valery Kartel <valery.kartel@gmail.com> | 2015-07-28 16:13:16 +0300 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2015-07-29 06:30:16 +0000 |
| commit | 62e496a8556428148ee596bd01b5fa8ac1a45903 (patch) | |
| tree | 6f8b54b8abc689f3680fed3ebc30634ee5f2eea1 | |
| parent | 4b68d50b717b4442c3f96702d2b5a235899a2826 (diff) | |
main/dovecot: Some cleanups in init & logrotate scripts
| -rw-r--r-- | main/dovecot/APKBUILD | 14 | ||||
| -rw-r--r-- | main/dovecot/dovecot.initd | 17 | ||||
| -rw-r--r-- | main/dovecot/dovecot.logrotate | 5 |
3 files changed, 13 insertions, 23 deletions
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD index 37d1c93b5eb..9d94bd3ed04 100644 --- a/main/dovecot/APKBUILD +++ b/main/dovecot/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dovecot pkgver=2.2.18 -pkgrel=0 +pkgrel=1 pkgdesc="IMAP and POP3 server" url="http://www.dovecot.org/" arch="all" @@ -131,16 +131,16 @@ config() { md5sums="1e42eb3b69544c447ad882d7858f3630 dovecot-2.2.18.tar.gz 49f7a03284cc657857fe2ae22b8c82a0 hide-dl-errors.patch -aec5cc797ab2acf72ce3b6bb1030345f dovecot.logrotate -1d9c3a6b843c0fdfec09cc677e0c1f3a dovecot.initd +1a88280b65efb6cb7f70bc5a88bf264c dovecot.logrotate +2a63d966ce4d9c63cecf99d183c394a0 dovecot.initd 95cf57ecc835882228bbbb019ce3abf8 dovecot-sample-config.post-install" sha256sums="b6d8468cea47f1227f47b80618f7fb872e2b2e9d3302adc107a005dd083865bb dovecot-2.2.18.tar.gz d6accdd6e271647c01ab8fa0a9491ee822486484961e2d5c252bf70e816d2bfa hide-dl-errors.patch -3ac8a0b2b078f84e598266c047937f4e63265ff646866a944d9b4f03b6fe4896 dovecot.logrotate -2ce42d34029061a3e8d60808c7a9d96e059918947581d7850aca823b9be145a5 dovecot.initd +2ac04bb7b5c503cd87ba044482e651dbe5c9d84a4268891fb2aa9ba26e62f833 dovecot.logrotate +e6dd8e654a66aeb84ae63959de290ccf6ba05d890232a107edf1bb83a88767bb dovecot.initd 7dab0591eca7fe1473ae7b39ed9ae0d7d51617ffea01252ace5c3aa68150693f dovecot-sample-config.post-install" sha512sums="227fa9c55070ce305d41faebb0fe15df86cb70427dd4043a01837095228b5504121fccaecfbf47fab3426334449b637bffdfe9a93ee2322bb8ff8d69de4967c7 dovecot-2.2.18.tar.gz 1e9a1f2990019236546c7be581a4d6d0b430110d27a00bc3298f5c154ef9a4aadefa193d02a017912f826d771058fd5c6ef6cb454e14f0d15749fa8f3a68c64a hide-dl-errors.patch -cd7c0feb5ad620175692be2f9ca821fbccd970647c5bf5b597dc02d48ab128cc2f7aa7657804e984197e590c8804ac7f7491fa40c6efb03f5209e127fa00583f dovecot.logrotate -9c50969126a2525810f1da076795c20b56f387834bc0adc91d017e28e8b14a52cdcd320bd623a39910e7dfd9effcd87d454b98143f4fcdb6a0f013877f3558ee dovecot.initd +58756fa06a063777ef7c4d1e67b63adbde5462264e14bd7a3187a318f498fff21ac2a8d53bb216f56fef4588206e14112da79542b6dfdf503988786f27bb6544 dovecot.logrotate +984b24d331e0d837c2c16db1e6e3d5a7fd43b1cfb3e0b1450402dfc7f9cc59ed5a13c553a34864c045a8ffc274ddb728e46e68e2483caef56e98775c219ee687 dovecot.initd c5665334b0664ae29f52c022a8ffc2e520cfc506e399d2e614464dd5770caade794eeaf3406fe8ded1d927b06672d0597e2fe53d32fbfaf9f4cf025bce792a5b dovecot-sample-config.post-install" diff --git a/main/dovecot/dovecot.initd b/main/dovecot/dovecot.initd index 9a04c83c981..646f80a9455 100644 --- a/main/dovecot/dovecot.initd +++ b/main/dovecot/dovecot.initd @@ -1,15 +1,11 @@ #!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init-r3,v 1.1 2011/09/17 10:33:38 eras Exp $ extra_started_commands="reload" depend() { need localmount net - before postfix - after bootmisc firewall ldap mysql ntp-client ntpd postgresql \ - saslauthd slapd + before exim postfix + after bootmisc firewall ldap mysql ntp-client ntpd postgresql saslauthd slapd use logger } @@ -37,23 +33,20 @@ checkconfig() { start() { checkconfig || return 1 ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec /usr/sbin/dovecot \ - --pidfile "${DOVECOT_PIDFILE}" -- -c "${DOVECOT_CONF}" + start-stop-daemon --start --exec /usr/sbin/dovecot --pidfile "${DOVECOT_PIDFILE}" -- -c "${DOVECOT_CONF}" eend $? } stop() { checkconfig || return 1 ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --exec /usr/sbin/dovecot \ - --pidfile "${DOVECOT_PIDFILE}" + start-stop-daemon --stop --exec /usr/sbin/dovecot --pidfile "${DOVECOT_PIDFILE}" eend $? } reload() { checkconfig || return 1 ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes" - start-stop-daemon --signal HUP --exec /usr/sbin/dovecot \ - --pidfile "${DOVECOT_PIDFILE}" + start-stop-daemon --signal HUP --exec /usr/sbin/dovecot --pidfile "${DOVECOT_PIDFILE}" eend $? } diff --git a/main/dovecot/dovecot.logrotate b/main/dovecot/dovecot.logrotate index 7bd0003f7fb..89255f8dd70 100644 --- a/main/dovecot/dovecot.logrotate +++ b/main/dovecot/dovecot.logrotate @@ -7,9 +7,6 @@ notifempty sharedscripts postrotate - if /etc/init.d/dovecot -q status ; then \ - /etc/init.d/dovecot reload > /dev/null 2>&1 || true ; \ - fi; + /etc/init.d/dovecot --quiet --ifstarted reload endscript } - |