From owner-svn-ports-all@freebsd.org Mon Jan 28 09:27:19 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA2E914AD0B1; Mon, 28 Jan 2019 09:27:18 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7E96682412; Mon, 28 Jan 2019 09:27:18 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 704B21D98D; Mon, 28 Jan 2019 09:27:18 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0S9RIm2042986; Mon, 28 Jan 2019 09:27:18 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0S9RI2j042983; Mon, 28 Jan 2019 09:27:18 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201901280927.x0S9RI2j042983@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Mon, 28 Jan 2019 09:27:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491466 - in head/databases/pgpool-II-40: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tz X-SVN-Commit-Paths: in head/databases/pgpool-II-40: . files X-SVN-Commit-Revision: 491466 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7E96682412 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.975,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2019 09:27:19 -0000 Author: tz Date: Mon Jan 28 09:27:17 2019 New Revision: 491466 URL: https://svnweb.freebsd.org/changeset/ports/491466 Log: databases/pgpool-II-40: add new configuration files to rc-script pgpool 4.0 adds the configuration files "pool_hba.conf" and "pcp.conf", but they weren't used until now. Also its possible to change there location via rc.conf PR: 235059 Submitted by: Franco Ricci Modified: head/databases/pgpool-II-40/Makefile head/databases/pgpool-II-40/files/pgpool.in Modified: head/databases/pgpool-II-40/Makefile ============================================================================== --- head/databases/pgpool-II-40/Makefile Mon Jan 28 09:19:31 2019 (r491465) +++ head/databases/pgpool-II-40/Makefile Mon Jan 28 09:27:17 2019 (r491466) @@ -2,7 +2,7 @@ PORTNAME= pgpool-II PORTVERSION= 4.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= http://www.pgpool.net/mediawiki/images/ PKGNAMESUFFIX= 40 Modified: head/databases/pgpool-II-40/files/pgpool.in ============================================================================== --- head/databases/pgpool-II-40/files/pgpool.in Mon Jan 28 09:19:31 2019 (r491465) +++ head/databases/pgpool-II-40/files/pgpool.in Mon Jan 28 09:27:17 2019 (r491466) @@ -9,14 +9,18 @@ # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # -# pgpool_enable (bool): Set to NO by default. -# Set it to YES to enable pgpool. -# pgpool_conf (file): Set location of your config. -# Default is "%%PREFIX%%/etc/pgpool.conf" -# pgpool_user (uid): User ID to run as (default nobody) -# pgpool_stop_mode (string): Shutdown mode -# Default is "smart" -# Possibilities are "smart", "fast", or "immediate" +# pgpool_enable (bool): Set to NO by default. +# Set it to YES to enable pgpool. +# pgpool_conf (file): Set location of your config. +# Default is "%%PREFIX%%/etc/pgpool.conf" +# pgpool_hba (file): Set location of your pool hba file. +# Default is "%%PREFIX%%/etc/pool_hba.conf" +# pgpool_pcp (file): Set location of your pcp conf file. +# Default is "%%PREFIX%%/etc/pcp.conf" +# pgpool_user (uid): User ID to run as (default nobody) +# pgpool_stop_mode (string): Shutdown mode +# Default is "smart" +# Possibilities are "smart", "fast", or "immediate" # . /etc/rc.subr @@ -28,13 +32,19 @@ load_rc_config $name : ${pgpool_enable="NO"} : ${pgpool_conf="%%PREFIX%%/etc/pgpool.conf"} +: ${pgpool_hba="%%PREFIX%%/etc/pool_hba.conf"} +: ${pgpool_pcp="%%PREFIX%%/etc/pcp.conf"} : ${pgpool_user="nobody"} : ${pgpool_stop_mode="smart"} command="%%PREFIX%%/bin/pgpool" -command_args="-f ${pgpool_conf}" +command_args="-f ${pgpool_conf} -a ${pgpool_hba} -F ${pgpool_pcp}" stop_cmd="${command} -m ${pgpool_stop_mode} ${command_args} stop" +reload_cmd="${command} ${command_args} reload" +extra_commands="reload" required_files="${pgpool_conf}" + run_rc_command "$1" +