From a8e7c707a3e85cfcbdf2706634e8fc07dd9b3f54 Mon Sep 17 00:00:00 2001 From: Timo Weingärtner Date: Sat, 3 Nov 2012 17:43:58 +0100 Subject: update pgsql plugin documentation + add SSL verification options + replace PGCLUSTER with PGHOST, former cements the use of a specific version of postgresql-client. Git-Dch: Full --- examples/psql | 4 +++- plugins/psql | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/psql b/examples/psql index e2e72cb..3fc7102 100644 --- a/examples/psql +++ b/examples/psql @@ -3,8 +3,10 @@ PLUGIN=psql # the session was not interactive EXIT_IGNORE=2 -PGCLUSTER=8.3/db.example.com: +PGHOST=db.example.com PGDATABASE=exampledb +PGSSLMODE=verify-full +PGSSLROOTCERT=/etc/ssl/certs/examplerootcert PGUSER=exampleuser PGPASSWORD=foobar # beware: will be readable from /proc//environ, better: PGPASSFILE=/path/to/.pgpass diff --git a/plugins/psql b/plugins/psql index d1009ef..aa210d2 100755 --- a/plugins/psql +++ b/plugins/psql @@ -2,20 +2,18 @@ # psql plugin # -# uses psql to download a table (or view) of the form: +# uses psql to download a TABLE (or VIEW) of the form: # CREATE TABLE known_hosts ( # namelist text, # comma seperated # type text, # key text # ); +# alternatively only one column with spaces between those three # # ENVIRONMENT VARIABLES: # TABLE table to download # used by psql: -# PGCLUSTER see pg_wrapper(1) -# PGDATABASE see psql(1) -# PGUSER .. -# PGPASSFILE .. +# PG* see psql(1) # set -e -- cgit v1.2.3