Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit26d60f2

Browse files
committed
fixes docs and missing initdb help option for commit978f869
Reported-by: Erik RijkersDiscussion:https://postgr.es/m/a27e7bb60fc4c4a1fe960f7b055ba822@xs4all.nlBackpatch-through: master
1 parent08db7c6 commit26d60f2

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

‎doc/src/sgml/database-encryption.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
log from being able to access the data stored in those files.
1414
For example, when using cluster file encryption, users who have read
1515
access to the cluster directories for backup purposes will not be able
16-
to decrypt the data stored inthethese files.
16+
to decrypt the data stored in these files.
1717
</para>
1818

1919
<para>
@@ -24,7 +24,7 @@
2424
Key one is used to encrypt write-ahead log (WAL) files. Two different
2525
keys are used so that primary and standby servers can use different zero
2626
(heap/index/temp) keys, but the same one (WAL) key, so that these keys
27-
can eventually be rotated by switching the primary to the standby as
27+
can eventually be rotated by switching the primary to the standby
2828
and then changing the WAL key.
2929
</para>
3030

@@ -68,7 +68,7 @@ initdb -D dbname --cluster-key-command='ckey_passphrase.sh'
6868
During the <command>initdb</command> process, if
6969
<option>--cluster-key-command</option> is specified, two data-level
7070
encryption keys are created. These two keys are then encrypted with
71-
the keyenryption key (KEK) supplied by the cluster key command before
71+
the keyencryption key (KEK) supplied by the cluster key command before
7272
being stored in the database directory. The key or passphrase that
7373
derives the key must be supplied from the terminal or stored in a
7474
trusted key store, such as key vault software, hardware security module.
@@ -87,7 +87,7 @@ initdb -D dbname --cluster-key-command='ckey_passphrase.sh'
8787
</para>
8888

8989
<para>
90-
The data encryption keys are randomly generated and areof128, 192,
90+
The data encryption keys are randomly generated and are 128, 192,
9191
or 256-bits in length. They are encrypted by the key encryption key
9292
(KEK) using Advanced Encryption Standard (<acronym>AES256</acronym>)
9393
encryption in Galois/Counter Mode (<acronym>GCM</acronym>), which also

‎src/bin/initdb/initdb.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2326,6 +2326,8 @@ usage(const char *progname)
23262326
printf(_(" -R, --authprompt prompt for a passphrase or PIN\n"));
23272327
printf(_(" -s, --show show internal settings\n"));
23282328
printf(_(" -S, --sync-only only sync data directory\n"));
2329+
printf(_(" -u, --copy-encryption-keys=DATADIR\n"
2330+
" copy the file encryption key from another cluster\n"));
23292331
printf(_("\nOther options:\n"));
23302332
printf(_(" -V, --version output version information, then exit\n"));
23312333
printf(_(" -?, --help show this help, then exit\n"));

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp