From fd81bb52536b0b5eac016cc1f52aacc97d90800b Mon Sep 17 00:00:00 2001 From: Asara Date: Sat, 8 Jul 2023 13:23:02 -0400 Subject: [PATCH] add ivyking, some cleanup and updates --- ansible/group_vars/all/main.yml | 2 +- ansible/host_vars/ivyking.minhas.io/main.yml | 2 ++ ansible/inventory.txt | 4 ++++ ansible/playbooks/bitcoind.yml | 5 +++++ ansible/playbooks/common.yml | 1 + ansible/playbooks/lnd.yml | 1 - ansible/playbooks/site.yml | 2 +- ansible/roles/docker-repo/defaults/main.yml | 2 +- 8 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 ansible/host_vars/ivyking.minhas.io/main.yml create mode 100644 ansible/playbooks/bitcoind.yml diff --git a/ansible/group_vars/all/main.yml b/ansible/group_vars/all/main.yml index 4057ddc..4541fba 100644 --- a/ansible/group_vars/all/main.yml +++ b/ansible/group_vars/all/main.yml @@ -56,5 +56,5 @@ vault_ca_cert_payload: | -----END CERTIFICATE----- # lnd -lnd_version: 0.16.0-beta +lnd_version: 0.16.4-beta ... diff --git a/ansible/host_vars/ivyking.minhas.io/main.yml b/ansible/host_vars/ivyking.minhas.io/main.yml new file mode 100644 index 0000000..5dc5620 --- /dev/null +++ b/ansible/host_vars/ivyking.minhas.io/main.yml @@ -0,0 +1,2 @@ +--- +docker_repo_storage: /tank0/docker-repo diff --git a/ansible/inventory.txt b/ansible/inventory.txt index 7a91edf..0436a2e 100644 --- a/ansible/inventory.txt +++ b/ansible/inventory.txt @@ -5,6 +5,7 @@ redwingcherokee.minhas.io sedan.minhas.io fishbowl.minhas.io teapot[01:06].minhas.io +ivyking.minhas.io [hardtack] hardtack[1:7].minhas.io @@ -29,3 +30,6 @@ hardtack1.minhas.io [wekan] sedan.minhas.io + +[bitcoind] +ivyking.minhas.io diff --git a/ansible/playbooks/bitcoind.yml b/ansible/playbooks/bitcoind.yml new file mode 100644 index 0000000..9364628 --- /dev/null +++ b/ansible/playbooks/bitcoind.yml @@ -0,0 +1,5 @@ +--- +- hosts: bitcoind + roles: + - role: bitcoind +... diff --git a/ansible/playbooks/common.yml b/ansible/playbooks/common.yml index 8aa34d9..dbdb15e 100644 --- a/ansible/playbooks/common.yml +++ b/ansible/playbooks/common.yml @@ -2,4 +2,5 @@ - hosts: all roles: - role: common + - role: tor ... diff --git a/ansible/playbooks/lnd.yml b/ansible/playbooks/lnd.yml index fbea0d0..5df88a2 100644 --- a/ansible/playbooks/lnd.yml +++ b/ansible/playbooks/lnd.yml @@ -1,6 +1,5 @@ --- - hosts: lnd roles: - - role: tor - role: lnd ... diff --git a/ansible/playbooks/site.yml b/ansible/playbooks/site.yml index 0647491..02551bc 100644 --- a/ansible/playbooks/site.yml +++ b/ansible/playbooks/site.yml @@ -2,7 +2,7 @@ - import_playbook: common.yml - import_playbook: vault-server.yml - import_playbook: k3s.yml - #- import_playbook: docker-repo.yml +- import_playbook: docker-repo.yml - import_playbook: lnd.yml - import_playbook: wekan.yml ... diff --git a/ansible/roles/docker-repo/defaults/main.yml b/ansible/roles/docker-repo/defaults/main.yml index bb61874..5dc5620 100644 --- a/ansible/roles/docker-repo/defaults/main.yml +++ b/ansible/roles/docker-repo/defaults/main.yml @@ -1,2 +1,2 @@ --- -docker_repo_storage: /mnt/raid/docker-repo +docker_repo_storage: /tank0/docker-repo