Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit fd7673b

Browse files
peterepetere
committed
Make the default pg_hba.conf and pg_ident.conf align at 8-character boundaries
to make it easier to use with tabs.
1 parent aed1a01 commit fd7673b

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

‎doc/src/sgml/backup.sgml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.138 2010/01/24 14:46:01 mha Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.139 2010/01/26 06:45:31 petere Exp $ -->
22

33
<chapter id="backup">
44
<title>Backup and Restore</title>
@@ -2046,8 +2046,8 @@ if (!triggered)
20462046
# Allow the user "foo" from host 192.168.1.100 to connect to the primary
20472047
# as a replication standby if the user's password is correctly supplied.
20482048
#
2049-
# TYPE DATABASE USER CIDR-ADDRESS METHOD
2050-
host replication foo 192.168.1.100/32 md5
2049+
# TYPE DATABASE USER CIDR-ADDRESS METHOD
2050+
host replication foo 192.168.1.100/32 md5
20512051
</programlisting>
20522052
</para>
20532053
<para>

‎doc/src/sgml/client-auth.sgml

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/client-auth.sgml,v 1.126 2010/01/15 09:18:56 heikki Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/client-auth.sgml,v 1.127 2010/01/26 06:45:31 petere Exp $ -->
22

33
<chapter id="client-authentication">
44
<title>Client Authentication</title>
@@ -492,50 +492,50 @@ hostnossl <replaceable>database</replaceable> <replaceable>user</replaceable>
492492
# any database user name using Unix-domain sockets (the default for local
493493
# connections).
494494
#
495-
# TYPE DATABASE USER CIDR-ADDRESS METHOD
496-
local all all trust
495+
# TYPE DATABASE USER CIDR-ADDRESS METHOD
496+
local all all trust
497497

498498
# The same using local loopback TCP/IP connections.
499499
#
500-
# TYPE DATABASE USER CIDR-ADDRESS METHOD
501-
host all all 127.0.0.1/32 trust
500+
# TYPE DATABASE USER CIDR-ADDRESS METHOD
501+
host all all 127.0.0.1/32 trust
502502

503503
# The same as the previous line, but using a separate netmask column
504504
#
505-
# TYPE DATABASE USER IP-ADDRESS IP-MASK METHOD
506-
host all all 127.0.0.1 255.255.255.255 trust
505+
# TYPE DATABASE USER IP-ADDRESS IP-MASK METHOD
506+
host all all 127.0.0.1 255.255.255.255 trust
507507

508508
# Allow any user from any host with IP address 192.168.93.x to connect
509509
# to database "postgres" as the same user name that ident reports for
510510
# the connection (typically the Unix user name).
511511
#
512-
# TYPE DATABASE USER CIDR-ADDRESS METHOD
513-
host postgres all 192.168.93.0/24 ident
512+
# TYPE DATABASE USER CIDR-ADDRESS METHOD
513+
host postgres all 192.168.93.0/24 ident
514514

515515
# Allow any user from host 192.168.12.10 to connect to database
516516
# "postgres" if the user's password is correctly supplied.
517517
#
518-
# TYPE DATABASE USER CIDR-ADDRESS METHOD
519-
host postgres all 192.168.12.10/32 md5
518+
# TYPE DATABASE USER CIDR-ADDRESS METHOD
519+
host postgres all 192.168.12.10/32 md5
520520

521521
# In the absence of preceding "host" lines, these two lines will
522522
# reject all connections from 192.168.54.1 (since that entry will be
523523
# matched first), but allow Kerberos 5 connections from anywhere else
524524
# on the Internet. The zero mask means that no bits of the host IP
525525
# address are considered so it matches any host.
526526
#
527-
# TYPE DATABASE USER CIDR-ADDRESS METHOD
528-
host all all 192.168.54.1/32 reject
529-
host all all 0.0.0.0/0 krb5
527+
# TYPE DATABASE USER CIDR-ADDRESS METHOD
528+
host all all 192.168.54.1/32 reject
529+
host all all 0.0.0.0/0 krb5
530530

531531
# Allow users from 192.168.x.x hosts to connect to any database, if
532532
# they pass the ident check. If, for example, ident says the user is
533533
# "bryanh" and he requests to connect as PostgreSQL user "guest1", the
534534
# connection is allowed if there is an entry in pg_ident.conf for map
535535
# "omicron" that says "bryanh" is allowed to connect as "guest1".
536536
#
537-
# TYPE DATABASE USER CIDR-ADDRESS METHOD
538-
host all all 192.168.0.0/16 ident map=omicron
537+
# TYPE DATABASE USER CIDR-ADDRESS METHOD
538+
host all all 192.168.0.0/16 ident map=omicron
539539

540540
# If these are the only three lines for local connections, they will
541541
# allow local users to connect only to their own databases (databases
@@ -544,16 +544,16 @@ host all all 192.168.0.0/16 ident map=omicron
544544
# $PGDATA/admins contains a list of names of administrators. Passwords
545545
# are required in all cases.
546546
#
547-
# TYPE DATABASE USER CIDR-ADDRESS METHOD
548-
local sameuser all md5
549-
local all @admins md5
550-
local all +support md5
547+
# TYPE DATABASE USER CIDR-ADDRESS METHOD
548+
local sameuser all md5
549+
local all @admins md5
550+
local all +support md5
551551

552552
# The last two lines above can be combined into a single line:
553-
local all @admins,+support md5
553+
local all @admins,+support md5
554554

555555
# The database column can also use lists and file names:
556-
local db1,db2,@demodbs all md5
556+
local db1,db2,@demodbs all md5
557557
</programlisting>
558558
</example>
559559
</sect1>
@@ -668,14 +668,14 @@ mymap /^(.*)@otherdomain\.com$ guest
668668
<example id="example-pg-ident.conf">
669669
<title>An example <filename>pg_ident.conf</> file</title>
670670
<programlisting>
671-
# MAPNAME SYSTEM-USERNAME PG-USERNAME
671+
# MAPNAME SYSTEM-USERNAME PG-USERNAME
672672

673-
omicron bryanh bryanh
674-
omicron ann ann
673+
omicron bryanh bryanh
674+
omicron ann ann
675675
# bob has user name robert on these machines
676-
omicron robert bob
676+
omicron robert bob
677677
# bryanh can also connect as guest1
678-
omicron bryanh guest1
678+
omicron bryanh guest1
679679
</programlisting>
680680
</example>
681681
</sect1>

‎src/backend/libpq/pg_hba.conf.sample

+4-4
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@
6767

6868
@authcomment@
6969

70-
# TYPE DATABASE USER CIDR-ADDRESS METHOD
70+
# TYPE DATABASE USER CIDR-ADDRESS METHOD
7171

7272
@remove-line-for-nolocal@# "local" is for Unix domain socket connections only
73-
@remove-line-for-nolocal@local all all @authmethod@
73+
@remove-line-for-nolocal@local all all @authmethod@
7474
# IPv4 local connections:
75-
host all all 127.0.0.1/32 @authmethod@
75+
host all all 127.0.0.1/32 @authmethod@
7676
# IPv6 local connections:
77-
host all all ::1/128 @authmethod@
77+
host all all ::1/128 @authmethod@

‎src/backend/libpq/pg_ident.conf.sample

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@
3737
# Put your actual configuration here
3838
# ----------------------------------
3939

40-
# MAPNAME SYSTEM-USERNAME PG-USERNAME
40+
# MAPNAME SYSTEM-USERNAME PG-USERNAME

0 commit comments

Comments
 (0)