restructuring

.gitignore

@@ -1 +1,3 @@
 secrets.yml
+roles/*
+collections/*

ansible.cfg

@@ -2,3 +2,4 @@
 inventory=./inventory
 remote_user="ansible"
 roles_path=./roles
+collections_path=./collections

inventory/inventory

@@ -1,15 +1,19 @@
-[docker]
-192.168.2.240
-
 [control]
 localhost
 
 [dns]
 192.168.2.236
 
+[docker]
+192.168.1.236 ansible_user=ansible
+
 [aws]
 aws ansible_user=ubuntu
 
+[helm]
+192.168.1.233 ansible_user=ansible
+192.168.1.237 ansible_user=ansible
+
 [dhcp]
 192.168.2.191 
 
@@ -30,4 +34,3 @@ bane ansible_user=ansible ansible_connection=winrm ansible_winrm_transport=basic
 [servers:children]
 doc
 aws
-local

playbooks/caddy/setup_webserver.yml

@@ -1,5 +1,5 @@
 ---
-- name: installs and setups nginx on hosts
+- name: installs and setups caddy on hosts
   hosts: aws
   become: true
   vars:

playbooks/common/update_upgrade.yml

@@ -36,23 +36,23 @@
         name: "*"
         state: latest
 
-- name: Upgrade pihole on dns using docker compose
+#- name: Upgrade pihole on dns using docker compose
-  hosts: pihole
+  #hosts: pihole
-  tasks:
+  #tasks:
-    - name: pull new images via docker compose
+    #- name: pull new images via docker compose
-      command:
+      #command:
-        cmd: docker compose -f pihole_compose.yml pull
+        #cmd: docker compose -f pihole_compose.yml pull
-        chdir: /home/pollen/pihole
+        #chdir: /home/pollen/pihole
 
-    - name: remove the currently running container
+    #- name: remove the currently running container
-      command:
+      #command:
-        cmd: docker compose -f pihole_compose.yml down
+        #cmd: docker compose -f pihole_compose.yml down
-        chdir: /home/pollen/pihole
+        #chdir: /home/pollen/pihole
 
-    - name: bring back pihole container
+    #- name: bring back pihole container
-      command:
+      #command:
-        cmd: docker compose -f pihole_compose.yml up -d
+        #cmd: docker compose -f pihole_compose.yml up -d
-        chdir: /home/pollen/pihole
+        #chdir: /home/pollen/pihole
 
 # work in progress for windows host
 # - name: Upgrade software on windows hosts

playbooks/gitea/setup_database_gitea.yml

@@ -147,6 +147,3 @@
         name: gitea
         state: started
         enabled: yes
-
-
-

playbooks/helm/install_helm.yaml

@@ -0,0 +1,6 @@
+---
+- name: use Jeff GeerlingGuy's role to install helm
+  become: true
+  hosts: helm
+  roles:
+    - role: geerlingguy.helm

playbooks/k8s/control_node.yml

@@ -32,6 +32,3 @@
         groups: 
           - kvm
           - libvirt
-
-
-