mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-18 18:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve comments in sample config files.

Browse Source
This commit is contained in:
Tom Lane 2005-01-07 23:59:17 +00:00
parent ffce35fe6f
commit 3b5152cac6
2 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/backend/libpq/pg_hba.conf.sample
View File

@ -7,50 +7,56 @@
# #
# This file controls: which hosts are allowed to connect, how clients # This file controls: which hosts are allowed to connect, how clients
# are authenticated, which PostgreSQL user names they can use, which # are authenticated, which PostgreSQL user names they can use, which
# databases they can access. Records take one of seven forms: # databases they can access. Records take one of these forms:
# #
# local DATABASE USER METHOD [OPTION] # local DATABASE USER METHOD [OPTION]
# host DATABASE USER CIDR-ADDRESS METHOD [OPTION] # host DATABASE USER CIDR-ADDRESS METHOD [OPTION]
# hostssl DATABASE USER CIDR-ADDRESS METHOD [OPTION] # hostssl DATABASE USER CIDR-ADDRESS METHOD [OPTION]
# hostnossl DATABASE USER CIDR-ADDRESS METHOD [OPTION] # hostnossl DATABASE USER CIDR-ADDRESS METHOD [OPTION]
# #
# (The uppercase quantities should be replaced by actual values.) # (The uppercase items must be replaced by actual values.)
#
# The first field is the connection type: "local" is a Unix-domain socket, # The first field is the connection type: "local" is a Unix-domain socket,
# "host" is either a plain or SSL-encrypted TCP/IP socket, "hostssl" is an # "host" is either a plain or SSL-encrypted TCP/IP socket, "hostssl" is an
# SSL-encrypted TCP/IP socket, and "hostnossl" is a plain TCP/IP socket. # SSL-encrypted TCP/IP socket, and "hostnossl" is a plain TCP/IP socket.
# DATABASE can be "all", "sameuser", "samegroup", a database name (or #
# a comma-separated list thereof), or a file name prefixed with "@". # DATABASE can be "all", "sameuser", "samegroup", a database name, or
# USER can be "all", an actual user name or a group name prefixed with # a comma-separated list thereof.
# "+" or a list containing either. #
# USER can be "all", a user name, a group name prefixed with "+", or
# a comma-separated list thereof. In both the DATABASE and USER fields
# you can also write a file name prefixed with "@" to include names from
# a separate file.
# #
# CIDR-ADDRESS specifies the set of hosts the record matches. # CIDR-ADDRESS specifies the set of hosts the record matches.
# It is made up of an IP address and a CIDR mask that is an integer # It is made up of an IP address and a CIDR mask that is an integer
# (between 0 and 32 (IPv6) or 128(IPv6) inclusive) that specifies # (between 0 and 32 (IPv6) or 128(IPv6) inclusive) that specifies
# the number of significant bits in the mask Also, you can use a # the number of significant bits in the mask. Alternatively, you can write
# separate IP address and netmask to specify the set of hosts. # an IP address and netmask in separate columns to specify the set of hosts.
# #
# METHOD can be "trust", "reject", "md5", "crypt", "password", # METHOD can be "trust", "reject", "md5", "crypt", "password",
# "krb4", "krb5", "ident", or "pam". Note that "password" uses # "krb4", "krb5", "ident", or "pam". Note that "password" sends passwords
# clear-text passwords; "md5" is preferred for encrypted passwords. # in clear text; "md5" is preferred since it sends encrypted passwords.
# OPTION is the ident map or the name of the PAM service. #
# OPTION is the ident map or the name of the PAM service, depending on METHOD.
# #
# Database and user names containing spaces, commas, quotes and other special # Database and user names containing spaces, commas, quotes and other special
# characters can be quoted. Quoting one of the keywords "all", "sameuser" or # characters must be quoted. Quoting one of the keywords "all", "sameuser" or
# "samegroup" makes the name lose its special character, and just match a # "samegroup" makes the name lose its special character, and just match a
# database or username with that name. # database or username with that name.
# #
# This file is read on server startup and when the postmaster receives # This file is read on server startup and when the postmaster receives
# a SIGHUP signal. If you edit the file on a running system, you have # a SIGHUP signal. If you edit the file on a running system, you have
# to SIGHUP the postmaster for the changes to take effect, or use # to SIGHUP the postmaster for the changes to take effect. You can use
# "pg_ctl reload". # "pg_ctl reload" to do that.
# Put your actual configuration here # Put your actual configuration here
# ---------------------------------- # ----------------------------------
# #
# If you want to allow non-local connections, you need to add more # If you want to allow non-local connections, you need to add more
# "host" records. In that case you will also need to make PostgreSQL listen # "host" records. In that case you will also need to make PostgreSQL listen
# on a non-local interface via the listen_addresses configuration parameter, or # on a non-local interface via the listen_addresses configuration parameter,
# the -i or -h command line switches. # or via the -i or -h command line switches.
# #
@authcomment@ @authcomment@

9
src/backend/libpq/pg_ident.conf.sample
View File

@ -11,18 +11,19 @@
# #
# MAPNAME IDENT-USERNAME PG-USERNAME # MAPNAME IDENT-USERNAME PG-USERNAME
# #
# (The uppercase quantities should be replaced by actual values.) # (The uppercase quantities must be replaced by actual values.)
#
# MAPNAME is the (otherwise freely chosen) map name that was used in # MAPNAME is the (otherwise freely chosen) map name that was used in
# pg_hba.conf. IDENT-USERNAME is the detected user name of the # pg_hba.conf. IDENT-USERNAME is the detected user name of the
# client. PG-USERNAME is the request PostgreSQL user name. The # client. PG-USERNAME is the requested PostgreSQL user name. The
# existence of a record specifies that IDENT-USERNAME may connect as # existence of a record specifies that IDENT-USERNAME may connect as
# PG-USERNAME. Multiple maps may be specified in this file and used # PG-USERNAME. Multiple maps may be specified in this file and used
# by pg_hba.conf. # by pg_hba.conf.
# #
# This file is read on server startup and when the postmaster receives # This file is read on server startup and when the postmaster receives
# a SIGHUP signal. If you edit the file on a running system, you have # a SIGHUP signal. If you edit the file on a running system, you have
# to SIGHUP the postmaster for the changes to take effect, or use # to SIGHUP the postmaster for the changes to take effect. You can use
# "pg_ctl reload". # "pg_ctl reload" to do that.
# Put your actual configuration here # Put your actual configuration here
# ---------------------------------- # ----------------------------------