Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix ansible-vault diff #4425

Merged
merged 1 commit into from
Nov 1, 2023
Merged

fix ansible-vault diff #4425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions topics/admin/tutorials/ansible-galaxy/tutorial.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,6 +1143,12 @@ The configuration is quite simple thanks to the many sensible defaults that are
> > to ensure colleagues get a copy of the file too. Just **be sure**
> > `.vault-password.txt` is listed in your `.gitignore` file!
> >
> > You will also need to run this command to define how the `ansible-vault` differ should work:
> >
> > ```
> > git config --global diff.ansible-vault.textconv "ansible-vault view"
> > ```
> >
> > If you have more vault secrets, you can adjust this line (or add more,
> > wildcards are supported) to list all of your secret files. This tells
> > `git` to use `ansible-vault` to diff the two files, as you can see in
Expand Down
Loading