From e3872864be25f7421015bef2732fa57c0c9fb726 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 Aug 2018 08:53:53 +0100 Subject: gentoo resync : 04.08.2018 --- dev-db/pgpool2/files/pgpool2.initd | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'dev-db/pgpool2/files/pgpool2.initd') diff --git a/dev-db/pgpool2/files/pgpool2.initd b/dev-db/pgpool2/files/pgpool2.initd index c9ffb0cf1611..73db4dd8b3c8 100644 --- a/dev-db/pgpool2/files/pgpool2.initd +++ b/dev-db/pgpool2/files/pgpool2.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 extra_started_commands="reload" @@ -23,24 +23,22 @@ get_config() { PIDFILE="$(get_config pid_file_name)" : ${PIDFILE:='/run/pgpool/pgpool.pid'} -prep() { +start_pre() { # $logdir contains status file(s), not log files. local logdir=$(get_config logdir) local socket_dir=$(get_config socket_dir) local pcp_socket_dir=$(get_config pcp_socket_dir) checkpath -o pgpool:postgres -m 0770 -d $(dirname ${PIDFILE}) || return 1 - checkpath -o pgpool:postgres -m 0770 -d ${logdir:-'/run/pgpool'} || return 1 + checkpath -o pgpool:postgres -m 0770 -d ${logdir:-'/var/lib/pgpool'} || return 1 checkpath -o pgpool:postgres -m 0660 -f ${LOGFILE} || return 1 - checkpath -o postgres:postgres -m 0770 \ + checkpath -o root:postgres -m 1775 \ -d ${socket_dir:-'/run/postgresql'} || return 1 - checkpath -o postgres:postgres -m 0770 \ - -d ${pcp_socket_dir:-'/run/postgresql'} || return 1 + checkpath -o pgpool:postgres -m 0770 \ + -d ${pcp_socket_dir:-'/run/postgresql/pgpool'} || return 1 } start() { - prep || return 1 - ebegin "Starting pgpool2" start-stop-daemon --start \ -- cgit v1.2.3