From owner-freebsd-bugs@FreeBSD.ORG Wed Sep 26 12:10:04 2012 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3638E106564A for ; Wed, 26 Sep 2012 12:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 082AC8FC15 for ; Wed, 26 Sep 2012 12:10:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8QCA3Uc029280 for ; Wed, 26 Sep 2012 12:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8QCA3WR029279; Wed, 26 Sep 2012 12:10:03 GMT (envelope-from gnats) Resent-Date: Wed, 26 Sep 2012 12:10:03 GMT Resent-Message-Id: <201209261210.q8QCA3WR029279@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0C3BE106567D for ; Wed, 26 Sep 2012 12:01:33 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id D22C18FC15 for ; Wed, 26 Sep 2012 12:01:32 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q8QC1W3o031208 for ; Wed, 26 Sep 2012 12:01:32 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q8QC1WaO031207; Wed, 26 Sep 2012 12:01:32 GMT (envelope-from nobody) Message-Id: <201209261201.q8QC1WaO031207@red.freebsd.org> Date: Wed, 26 Sep 2012 12:01:32 GMT From: Dmitry To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/172089: databases/postgresql92-server change periodic script [patch] X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2012 12:10:04 -0000 >Number: 172089 >Category: misc >Synopsis: databases/postgresql92-server change periodic script [patch] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Sep 26 12:10:03 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Dmitry >Release: 9.1-PRERELEASE >Organization: - >Environment: FreeBSD *** 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r240914: *** root@***:/usr/obj/usr/src/sys/GENERIC_ amd64 >Description: periodic script not allow configure pgsql user and port >How-To-Repeat: >Fix: Patch attached with submission follows: --- files/502.pgsql.in.orig 2011-10-18 15:03:32.000000000 +0600 +++ files/502.pgsql.in 2012-09-26 17:48:27.000000000 +0600 @@ -19,14 +19,6 @@ # daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases # daily_pgsql_vacuum_enable="YES" # do vacuum -daily_pgsql_user=%%PG_USER%% -daily_pgsql_vacuum_args="-U ${daily_pgsql_user} -qaz" -daily_pgsql_pgdump_args="-U ${daily_pgsql_user} -bF c" -daily_pgsql_pgdumpall_globals_args="-U ${daily_pgsql_user}" -# backupdir is relative to ~pgsql home directory unless it begins with a slash: -daily_pgsql_backupdir="~${daily_pgsql_user}/backups" -daily_pgsql_savedays="7" - # If there is a global system configuration file, suck it in. # if [ -r /etc/defaults/periodic.conf ] @@ -35,6 +27,15 @@ source_periodic_confs fi +daily_pgsql_user=${daily_pgsql_user:-"%%PG_USER%%"} +daily_pgsql_port=${daily_pgsql_port:-"5432"} +daily_pgsql_vacuum_args="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -qaz" +daily_pgsql_pgdump_args="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -bF c" +daily_pgsql_pgdumpall_globals_args="-U ${daily_pgsql_user} -p ${daily_pgsql_port}" +# backupdir is relative to ~pgsql home directory unless it begins with a slash: +daily_pgsql_backupdir="~${daily_pgsql_user}/backups" +daily_pgsql_savedays="7" + # allow '~´ in dir name eval backupdir=${daily_pgsql_backupdir} @@ -82,7 +83,7 @@ case "$daily_pgsql_backup_enable" in [Yy][Ee][Ss]) - dbnames=`su -l %%PG_USER%% -c "umask 077; psql -q -t -A -d template1 -U %%PG_USER%% -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"` + dbnames=`su -l ${daily_pgsql_user} -c "umask 077; psql -U ${daily_pgsql_user} -p ${daily_pgsql_port} -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"` pgsql_backup $dbnames ;; >Release-Note: >Audit-Trail: >Unformatted: