Use Ansible Vault for storing users

Closes #211.
python-discord · Apr 15, 2024 · 3516f01 · 3516f01
1 parent 9f00fec
commit 3516f01
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/lint-ansible.yaml b/.github/workflows/lint-ansible.yaml
@@ -22,7 +22,6 @@ jobs:
         run: |
           cd ansible
           echo "$VAULT_PASSWORD" > vault_passwords
-          grep -R GITCRYPT --files-with-matches . | xargs rm
           ansible-lint --offline
         env:
           VAULT_PASSWORD: "${{ secrets.vault-password }}"
diff --git a/ansible/.gitattributes b/ansible/.gitattributes
@@ -1 +1 @@
-roles/pydis-users/vars/main.yml filter=git-crypt diff=git-crypt
+roles/pydis-users/vars/main.yml diff=ansible-vault merge=binary
diff --git a/ansible/README.md b/ansible/README.md
@@ -15,3 +15,5 @@ To setup a local environment using VMs for testing, [Read here](./local_testing/
 1. Install project dependencies: `python -m pip install -r requirements.txt`
 1. Install the pre-commit hook: `pre-commit install`
 1. Create a `vault_passwords` file and write the vault password to it
+1. Configure the Ansible Vault git diff driver using `git config --global
+   diff.ansible-vault.textconv "ansible-vault view"` and `git config diff.ansible-vault.cachetextconv false`
diff --git a/ansible/roles/pydis-users/vars/main.yml b/ansible/roles/pydis-users/vars/main.yml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		roles/pydis-users/vars/main.yml filter=git-crypt diff=git-crypt
		roles/pydis-users/vars/main.yml diff=ansible-vault merge=binary