summaryrefslogtreecommitdiff
path: root/src/backend/utils/misc/postgresql.conf.sample
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2004-10-08 01:36:36 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2004-10-08 01:36:36 +0000
commit7ca3a0f3e28e9d89d390214f6be59d7c8e88d367 (patch)
tree0c79bf0b44cbbd62eeb39380a0b45a501c75dfbf /src/backend/utils/misc/postgresql.conf.sample
parentf4f6caa9b02af8313b3fa0f76f069b614cb98095 (diff)
Whack some sense into the configuration-file-location patch.
Refactor code into something reasonably understandable, cause use of the feature to not fail in standalone backends or in EXEC_BACKEND case, fix sloppy guc.c table entries, make the documentation minimally usable.
Diffstat (limited to 'src/backend/utils/misc/postgresql.conf.sample')
-rw-r--r--src/backend/utils/misc/postgresql.conf.sample14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 2eb7baceae4..3c689c7eacb 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -26,13 +26,17 @@
#---------------------------------------------------------------------------
-# CONFIGURATION FILES
+# FILE LOCATIONS
#---------------------------------------------------------------------------
-# pgdata = '/usr/local/pgsql/data' # use data in another directory
-# hba_conf = '/etc/pgsql/pg_hba.conf' # use hba info in another directory
-# ident_conf = '/etc/pgsql/pg_ident.conf' # use ident info in another directory
-# external_pidfile= '/var/run/postgresql.pid' # write an extra pid file
+# The default values of these variables are driven from the -D command line
+# switch or PGDATA environment variable, represented here as $PGDATA.
+# pgdata = '$PGDATA' # use data in another directory
+# hba_conf = '$PGDATA/pg_hba.conf' # the host-based authentication file
+# ident_conf = '$PGDATA/pg_ident.conf' # the IDENT configuration file
+
+# If external_pidfile is not explicitly set, no extra pid file is written.
+# external_pidfile = '(none)' # write an extra pid file
#---------------------------------------------------------------------------