Attachment 91791 Details for Bug 129274 – file.diff

[patch] file.diff

file.diff (text/plain), 1.92 KB, created by Darren Pilgrim on 2008-11-29 08:00:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Pilgrim

Created: 2008-11-29 08:00:16 UTC

Size: 1.92 KB

patch

obsolete

>--- /usr/ports/mail/dovecot/files/dovecot.sh.in	2008-11-28 10:49:23.000000000 -0800
>+++ dovecot.sh.in.new	2008-11-28 23:24:09.000000000 -0800
>@@ -20,23 +20,27 @@
> # read configuration and set defaults
> load_rc_config ${name}
> : ${dovecot_enable:="NO"}
>+: ${dovecot_config:="/usr/local/etc/dovecot.conf"}
>+: ${dovecot_extra_configs:=""}
> 
> command="%%PREFIX%%/sbin/${name}"
>-command_args="-c ${dovecot_config:="%%PREFIX%%/etc/${name}.conf"}"
>-required_files="${dovecot_config}"
>+required_files="${dovecot_config} ${dovecot_extra_configs}"
>+restart_cmd="restart_cmd"
> start_precmd="start_precmd"
> stop_postcmd="stop_postcmd"
> extra_commands="restart"
> 
>-base_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^base_dir:/ { print $2 }')
>-login_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_dir:/ { print $2 }')
>-login_user=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_user:/ { print $2 }')
>-
>-pidfile="${base_dir}/master.pid"
>-
>+restart_cmd()
>+{	# Overriding this makes rc.subr run this once for each instance
>+	run_rc_command stop
>+	run_rc_command start
>+}
>+	
> start_precmd()
> {	# Ensure runtime directories exist with correct permissions
>-	local gid
>+	local login_dir login_user gid
>+	login_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_dir:/ { print $2 }')
>+	login_user=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_user:/ { print $2 }')
> 	gid=$(/usr/sbin/pw usershow -n "${login_user}" 2>/dev/null | /usr/bin/cut -d: -f4)
> 	/usr/bin/install -o root -g wheel -m 0755 -d ${base_dir}
> 	/usr/bin/install -o root -g ${gid} -m 0750 -d ${login_dir}
>@@ -47,4 +51,9 @@
> 	rm -rf ${base_dir} 2>/dev/null
> }
> 
>-run_rc_command "$1"
>+for config in ${dovecot_config} ${dovecot_extra_configs}; do
>+	command_args="-c ${config}"
>+	base_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^base_dir:/ { print $2 }')
>+	pidfile="${base_dir}/master.pid"
>+	run_rc_command "$1"
>+done

Actions: View | Diff

Attachments on bug 129274: 91791 | 91792 | 91793