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

make vi the default editor if no EDITOR

Browse source 
fixes #15577
This commit is contained in:
Brian Coca 2016-05-02 08:42:50 -04:00
parent c7cae3b08c
commit 4abadead76
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/man/man1/ansible-vault.1.asciidoc.in
View file

@ -63,7 +63,7 @@ CREATE
The *create* sub-command is used to initialize a new encrypted file. The *create* sub-command is used to initialize a new encrypted file.
After providing a password, the tool will launch whatever editor you have defined After providing a password, the tool will launch whatever editor you have defined
with $EDITOR, and defaults to vim. Once you are done with the editor session, the with $EDITOR, and defaults to vi. Once you are done with the editor session, the
file will be saved as encrypted data. file will be saved as encrypted data.
The default cipher is AES (which is shared-secret based). The default cipher is AES (which is shared-secret based).

2
docsite/rst/playbooks_vault.rst
View file

@ -29,7 +29,7 @@ To create a new encrypted data file, run the following command::
First you will be prompted for a password. The password used with vault currently must be the same for all files you wish to use together at the same time. First you will be prompted for a password. The password used with vault currently must be the same for all files you wish to use together at the same time.
After providing a password, the tool will launch whatever editor you have defined with $EDITOR, and defaults to vim. Once you are done with the editor session, the file will be saved as encrypted data. After providing a password, the tool will launch whatever editor you have defined with $EDITOR, and defaults to vi (before 2.1 the default was vim). Once you are done with the editor session, the file will be saved as encrypted data.
The default cipher is AES (which is shared-secret based). The default cipher is AES (which is shared-secret based).

2
lib/ansible/parsing/vault/__init__.py
View file

@ -445,7 +445,7 @@ class VaultEditor:
os.chown(dest, prev.st_uid, prev.st_gid) os.chown(dest, prev.st_uid, prev.st_gid)
def _editor_shell_command(self, filename): def _editor_shell_command(self, filename):
EDITOR = os.environ.get('EDITOR','vim') EDITOR = os.environ.get('EDITOR','vi')
editor = shlex.split(EDITOR) editor = shlex.split(EDITOR)
editor.append(filename) editor.append(filename)