database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00
Code Activity

Allow configuration files to be placed outside the data directory.

Browse Source 
Add new postgresql.conf variables to point to data, pg_hba.conf, and
pg_ident.conf files.

Needs more documentation.
This commit is contained in:
Bruce Momjian
2004-07-11 00:18:45 +00:00
parent b4a98c5fcc
commit 130f89e93f
10 changed files with 303 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.422 2004/07/01 00:51:11 tgl Exp $
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.423 2004/07/11 00:18:44 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@ -2164,7 +2164,7 @@ PostgresMain(int argc, char *argv[], const char *username)
{
int flag;
const char *dbname = NULL;
char *potential_DataDir = NULL;
char *userPGDATA = NULL;
bool secure;
int errs = 0;
int debug_flag = 0;
@ -2235,7 +2235,7 @@ PostgresMain(int argc, char *argv[], const char *username)
if (!IsUnderPostmaster)
{
InitializeGUCOptions();
potential_DataDir = getenv("PGDATA");
userPGDATA = getenv("PGDATA");
}
/* ----------------
@ -2283,7 +2283,7 @@ PostgresMain(int argc, char *argv[], const char *username)
case 'D': /* PGDATA directory */
if (secure)
potential_DataDir = optarg;
userPGDATA = optarg;
break;
case 'd': /* debug level */
@ -2574,12 +2574,12 @@ PostgresMain(int argc, char *argv[], const char *username)
* set up handler to log session end.
*/
if (IsUnderPostmaster && Log_disconnections)
on_proc_exit(log_disconnections,0);
on_proc_exit(log_disconnections, 0);
}
if (!IsUnderPostmaster)
{
if (!potential_DataDir)
if (!userPGDATA)
{
write_stderr("%s does not know where to find the database system data.\n"
"You must specify the directory that contains the database system\n"
@ -2588,7 +2588,7 @@ PostgresMain(int argc, char *argv[], const char *username)
argv[0]);
proc_exit(1);
}
SetDataDir(potential_DataDir);
SetDataDir(userPGDATA);
}
Assert(DataDir);