2 files changed, 9 insertions, 31 deletions

diff --git a/mail/sqlgrey/files/pkg-install.in b/mail/sqlgrey/files/pkg-install.in
index 4c5fc0a5e787..9c7fc94636ef 100644
--- a/mail/sqlgrey/files/pkg-install.in
+++ b/mail/sqlgrey/files/pkg-install.in
@@ -15,23 +15,6 @@ case $2 in
 	    exit 1
 	fi
 
-	# Create group if required
-	if /usr/sbin/pw group show "%%GROUP%%" >/dev/null 2>&1; then
-	    echo "---> Using existing group \"%%GROUP%%\""
-	else
-	    echo "---> Adding group \"%%GROUP%%\""
-	    /usr/sbin/pw groupadd %%GROUP%% || exit 1
-	fi
-
-	# Create user if required
-	if /usr/sbin/pw user show "%%USER%%" >/dev/null 2>&1; then
-	    echo "---> Using existing user \"%%USER%%\""
-	else
-	    echo "---> Adding user \"%%USER%%\""
-	    /usr/sbin/pw useradd "%%USER%%" -g "%%GROUP%%" -h - \
-	    -d "%%DATADIR%%" -s "/sbin/nologin" -c "Sqlgrey Owner" || exit 1
-	fi
-
 	# Create home directory if required
 	if [ -d "%%DATADIR%%" ]; then
 	    echo "---> Using existing Sqlgrey database directory (%%DATADIR%%)"
@@ -47,14 +30,8 @@ case $2 in
 
     POST-DEINSTALL)
 
-	echo "---> Please, remember to remove the user and the group with :"
-	if /usr/sbin/pw user show "%%USER%%" >/dev/null 2>&1; then
-	    echo "       /usr/sbin/pw userdel -n %%USER%%"
-	fi
-	if /usr/sbin/pw group show "%%GROUP%%" >/dev/null 2>&1; then
-	    echo "       /usr/sbin/pw groupdel -n %%GROUP%%"
-	fi
-	echo "     as well as the databases."
+	echo "---> Please, remember to remove the database directory:"
+	echo "     %%DATADIR%%"
 	echo "     If you're only updating, you can leave the things as they are."
     ;;
 
diff --git a/mail/sqlgrey/files/sqlgrey.in b/mail/sqlgrey/files/sqlgrey.in
index bb2652bddb7f..2c807ba4fd62 100644
--- a/mail/sqlgrey/files/sqlgrey.in
+++ b/mail/sqlgrey/files/sqlgrey.in
@@ -24,16 +24,17 @@ command_interpreter=%%PERL%%
 
 stop_postcmd=${name}_poststop
 
-sqlgrey_poststop()
-{
-	rm -f $pidfile
-}
-
 load_rc_config $name
 
 sqlgrey_enable=${sqlgrey_enable-"NO"}
 required_files=${sqlgrey_config-"%%PREFIX%%/%%ETCDIR%%/sqlgrey.conf"}
+pidfile=${sqlgrey_pidfile-"/var/run/sqlgrey.pid"}
 
-command_args="--configfile=${required_files} --daemonize"
+command_args="--configfile=${required_files} --pidfile=${pidfile} --daemonize"
+
+sqlgrey_poststop()
+{
+	rm -f $pidfile
+}
 
 run_rc_command "$1"