Sender: =?UTF-8?Q?Timo_Ter=C3=A4s?= <timo.teras@gmail.com>
Date: Wed, 23 Dec 2015 08:50:16 +0200
From: Timo Teras <timo.teras@iki.fi>
To: Valery Kartel <valery.kartel@gmail.com>
Cc: alpine-aports@lists.alpinelinux.org
Subject: Re: [alpine-aports] [PATCH] main/dovecot: new init-script with
 dovecot.instances support
Message-ID: <20151223085016.278e3a92@vostro>
In-Reply-To: <1450823874-24248-1-git-send-email-valery.kartel@gmail.com>
References: <1450823874-24248-1-git-send-email-valery.kartel@gmail.com>
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Wed, 23 Dec 2015 00:37:54 +0200
Valery Kartel <valery.kartel@gmail.com> wrote:

> ---
>  main/dovecot/dovecot.initd | 49
> +++++++++++----------------------------------- 1 file changed, 11
> insertions(+), 38 deletions(-)
> 
> diff --git a/main/dovecot/dovecot.initd b/main/dovecot/dovecot.initd
> index 880a39f..944ff87 100644
> --- a/main/dovecot/dovecot.initd
> +++ b/main/dovecot/dovecot.initd
> @@ -1,9 +1,12 @@
>  #!/sbin/openrc-run
>  
>  description="Secure POP3/IMAP server"
> -description_reload="Reload configuration"
> -
> +cfgfile=/etc/dovecot/${SVCNAME}.conf

This is not equivalent to what it used to be:
  DOVECOT_CONF=/etc/dovecot/dovecot.${DOVECOT_INSTANCE}.conf
or
  DOVECOT_CONF=/etc/dovecot/dovecot.conf

I wonder if this is acceptable.

Otherwise it looks good to me. But should probably also be flattened to
the dovecot upgrade commit.

Thanks.

> +pidfile=$(/usr/bin/doveconf -c $cfgfile -h base_dir
> 2>/dev/null)/master.pid +command=/usr/sbin/dovecot
> +required_files=$cfgfile
>  extra_started_commands="reload"
> +description_reload="Reload configuration"
>  
>  depend() {
>  	need localmount net
> @@ -12,46 +15,16 @@ depend() {
>  	use logger
>  }
>  
> -checkconfig() {
> -	DOVECOT_INSTANCE=${SVCNAME##*.}
> -	if [ -n "${DOVECOT_INSTANCE}" -a "${SVCNAME}" != "dovecot"
> ]; then
> -
> DOVECOT_CONF=/etc/dovecot/dovecot.${DOVECOT_INSTANCE}.conf
> -	else
> -		DOVECOT_CONF=/etc/dovecot/dovecot.conf
> -	fi
> -	if [ ! -e ${DOVECOT_CONF} ]; then
> -		eerror "You will need an ${DOVECOT_CONF} first"
> -		return 1
> -	fi
> -	if [ -x /usr/sbin/dovecot ]; then
> -		DOVECOT_BASEDIR=$(/usr/sbin/dovecot -c
> ${DOVECOT_CONF} -a | grep '^base_dir = ' | sed 's/^base_dir = //')
> -	else
> -		eerror "dovecot not executable"
> -		return 1
> -	fi
> -	DOVECOT_BASEDIR=${DOVECOT_BASEDIR:-/run/dovecot}
> -	DOVECOT_PIDFILE=${DOVECOT_BASEDIR}/master.pid
> -	checkpath --directory --owner dovecot:dovecot --mode 0755 \
> -		${DOVECOT_BASEDIR}
> -}
> -
> -start() {
> -	checkconfig || return 1
> -	ebegin "Starting ${SVCNAME}"
> -	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_pre() {
> +	ebegin
> +	[ "$cfgfile" = "/etc/dovecot/dovecot.conf" ] ||
> command_args="-c $cfgfile"
> +	checkpath --directory ${pidfile%/*}
> +	$command $command_args -a > /dev/null
>  	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_pre && start-stop-daemon --signal HUP --exec $command
> --pidfile $pidfile eend $?
>  }



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---