From b236fdb65b184dd3a7c64f5076e4349e1aff8618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Thu, 26 Sep 2024 18:19:53 +0300 Subject: [PATCH] Code Update --- init.sh | 18 +++++------------- src/functions/init.sh | 18 +++++------------- 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/init.sh b/init.sh index ef7801a..825346d 100755 --- a/init.sh +++ b/init.sh @@ -86,20 +86,12 @@ wi-init(){ if [ ! -f ~/.ansible/vars.yml ] then - openssl rand -base64 64 | tr -d '\n' | head -c 64 > ~/.ansible/vault.yml - - ANSIBLE_VAULT_SECRET=$(<~/.ansible/vault.yml) - echo "---" > ~/.ansible/vars.yml echo "hostname: $HOSTNAME" >> ~/.ansible/vars.yml - echo "folder: /$FOLDER/" >> ~/.ansible/vars.yml - echo "vault:" >> ~/.ansible/vars.yml - echo " ansible:" >> ~/.ansible/vars.yml - echo " secret: $ANSIBLE_VAULT_SECRET" >> ~/.ansible/vars.yml - echo " hashicorp:" >> ~/.ansible/vars.yml - echo " domain: $VAULT_DOMAIN" >> ~/.ansible/vars.yml - - /opt/ansible/bin/ansible-vault encrypt --vault-password-file ~/.ansible/vault.yml ~/.ansible/vars.yml > /dev/null + echo "config:" >> ~/.ansible/vars.yml + echo " identity:" >> ~/.ansible/vars.yml + echo " vault:" >> ~/.ansible/vars.yml + echo " domain: $VAULT_DOMAIN" >> ~/.ansible/vars.yml fi GIT_DOMAIN="git.cwinfo.net" @@ -110,7 +102,7 @@ wi-init(){ /opt/ansible/bin/ansible-galaxy collection install ansible.posix ansible.utils community.crypto community.dns community.docker community.general community.hashi_vault community.libvirt community.mongodb community.mysql community.postgresql containers.podman --upgrade &> /dev/null - /opt/ansible/bin/ansible-pull -U ssh://git@$GIT_DOMAIN:$GIT_PORT/$GIT_REPOSITORY --accept-host-key --vault-password-file ~/.ansible/vault.yml --private-key ~/.ssh/keys/init playbooks/init.yml -t init + /opt/ansible/bin/ansible-pull -U ssh://git@$GIT_DOMAIN:$GIT_PORT/$GIT_REPOSITORY --accept-host-key --private-key ~/.ssh/keys/init playbooks/init.yml -t init unset HVT } diff --git a/src/functions/init.sh b/src/functions/init.sh index a07e1b6..d82b658 100644 --- a/src/functions/init.sh +++ b/src/functions/init.sh @@ -20,20 +20,12 @@ wi-init(){ if [ ! -f ~/.ansible/vars.yml ] then - openssl rand -base64 64 | tr -d '\n' | head -c 64 > ~/.ansible/vault.yml - - ANSIBLE_VAULT_SECRET=$(<~/.ansible/vault.yml) - echo "---" > ~/.ansible/vars.yml echo "hostname: $HOSTNAME" >> ~/.ansible/vars.yml - echo "folder: /$FOLDER/" >> ~/.ansible/vars.yml - echo "vault:" >> ~/.ansible/vars.yml - echo " ansible:" >> ~/.ansible/vars.yml - echo " secret: $ANSIBLE_VAULT_SECRET" >> ~/.ansible/vars.yml - echo " hashicorp:" >> ~/.ansible/vars.yml - echo " domain: $VAULT_DOMAIN" >> ~/.ansible/vars.yml - - /opt/ansible/bin/ansible-vault encrypt --vault-password-file ~/.ansible/vault.yml ~/.ansible/vars.yml > /dev/null + echo "config:" >> ~/.ansible/vars.yml + echo " identity:" >> ~/.ansible/vars.yml + echo " vault:" >> ~/.ansible/vars.yml + echo " domain: $VAULT_DOMAIN" >> ~/.ansible/vars.yml fi GIT_DOMAIN="git.cwinfo.net" @@ -44,7 +36,7 @@ wi-init(){ /opt/ansible/bin/ansible-galaxy collection install ansible.posix ansible.utils community.crypto community.dns community.docker community.general community.hashi_vault community.libvirt community.mongodb community.mysql community.postgresql containers.podman --upgrade &> /dev/null - /opt/ansible/bin/ansible-pull -U ssh://git@$GIT_DOMAIN:$GIT_PORT/$GIT_REPOSITORY --accept-host-key --vault-password-file ~/.ansible/vault.yml --private-key ~/.ssh/keys/init playbooks/init.yml -t init + /opt/ansible/bin/ansible-pull -U ssh://git@$GIT_DOMAIN:$GIT_PORT/$GIT_REPOSITORY --accept-host-key --private-key ~/.ssh/keys/init playbooks/init.yml -t init unset HVT }