cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Modify wording to specify two ctl-d to end stdin input in ansible-vault (#69436)

Browse source 
* 51860 - Modify wording to specify two ctl-d to end stdin input in ansible-vault
* removes space to make line 160 chars
This commit is contained in:
John Westcott IV 2020-08-24 16:08:16 -04:00 committed by GitHub
parent 2b7461eb52
commit a6537b59ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/docsite/rst/user_guide/vault.rst
View file

@ -218,7 +218,7 @@ To encrypt the string 'letmein' read from stdin, add the vault ID 'test' using t
The command above creates this output:: The command above creates this output::
Reading plaintext input from stdin. (ctrl-d to end input) Reading plaintext input from stdin. (ctrl-d to end input, twice if your content does not already have a new line)
db_password: !vault | db_password: !vault |
$ANSIBLE_VAULT;1.2;AES256;dev $ANSIBLE_VAULT;1.2;AES256;dev
61323931353866666336306139373937316366366138656131323863373866376666353364373761 61323931353866666336306139373937316366366138656131323863373866376666353364373761
@ -237,7 +237,7 @@ The command above triggers this prompt:
.. code-block:: text .. code-block:: text
Reading plaintext input from stdin. (ctrl-d to end input) Reading plaintext input from stdin. (ctrl-d to end input, twice if your content does not already have a new line)
Type the string to encrypt (for example, 'hunter2'), hit ctrl-d, and wait. Type the string to encrypt (for example, 'hunter2'), hit ctrl-d, and wait.

2
lib/ansible/cli/vault.py
View file

@ -312,7 +312,7 @@ class VaultCLI(CLI):
# read from stdin # read from stdin
if self.encrypt_string_read_stdin: if self.encrypt_string_read_stdin:
if sys.stdout.isatty(): if sys.stdout.isatty():
display.display("Reading plaintext input from stdin. (ctrl-d to end input)", stderr=True) display.display("Reading plaintext input from stdin. (ctrl-d to end input, twice if your content does not already have a newline)", stderr=True)
stdin_text = sys.stdin.read() stdin_text = sys.stdin.read()
if stdin_text == '': if stdin_text == '':