|
|
|
|
@ -14,4 +14,16 @@
|
|
|
|
|
|
|
|
|
|
** rekeying the gpg thing
|
|
|
|
|
- make sure you know the ansible vault password
|
|
|
|
|
-
|
|
|
|
|
- encrypt the ansible-vault password with your new gpg key
|
|
|
|
|
- name that new file "vault_passphrase.gpg"
|
|
|
|
|
- there u go
|
|
|
|
|
|
|
|
|
|
** pulling in changes from upstream remote
|
|
|
|
|
first make sure you've got the remote configured:
|
|
|
|
|
|
|
|
|
|
- ~git remote add upstream git://theurl~
|
|
|
|
|
- ~git fetch upstream~
|
|
|
|
|
|
|
|
|
|
now you can merge in changes:
|
|
|
|
|
- ~git checkout main~
|
|
|
|
|
- ~git merge upstream/main~
|
|
|
|
|
|
