Эх сурвалжийг харах

feat: identify hosts by name and other basic improvements

Douglas A 2 сар өмнө
parent
commit
dc7eca69eb

+ 12 - 37
hosts

@@ -1,37 +1,12 @@
-[debian]
-192.168.100.3
-192.168.100.4
-192.168.100.12
-192.168.100.13
-192.168.100.100
-192.168.100.15
-192.168.180.7
-192.168.180.8
-192.168.180.9
-plex.delta.labs.andreanidr.com
-192.168.100.33
-192.168.180.96
-192.168.180.3
-192.168.180.4
-
-[docker1]
-192.168.180.9
-
-[bitwarden]
-192.168.180.8
-
-[freebsd]
-192.168.100.17
-192.168.180.94
-
-[freebsd_jails]
-192.168.100.17
-
-[debian:vars]
-ansible_python_interpreter=/usr/bin/python3
-
-[freebsd:vars]
-ansible_python_interpreter=/usr/local/bin/python3
-
-[freebsd_jails:vars]
-ansible_python_interpreter=/usr/local/bin/python3
+192.168.100.100	ubiquiti
+192.168.100.13	pihole
+192.168.100.3	transmission
+192.168.100.17	freebsd
+192.168.100.4	sonarr
+192.168.100.20	jellyfin
+192.168.100.15	wireguard
+
+192.168.180.7	nextcloud
+192.168.180.9	docker2
+192.168.180.3	database
+192.168.180.4	tooling

+ 1 - 16
main.yaml

@@ -7,30 +7,15 @@
     - { role: debian, tags: debian-update } 
     - { role: packages, tags: debian-packages }
 
-- hosts: centos
-  gather_facts: yes
-  user: ansible
-  become_user: root
-  become: yes
-  roles: 
-    - { role: centos, tags: centos-updates } 
-    - { role: packages, tags: centos-packages }
-
 - hosts: docker1
   gather_facts: yes
   user: ansible
   roles:
     - { role: docker1, tags: docker }
 
-- hosts: docker2
-  gather_facts: yes
-  user: ansible
-  roles:
-    - { role: docker2, tags: docker }
-
 - hosts: bitwarden
   gather_facts: yes
-  user: cmte
+  user: ansible
   roles:
     - { role: bitwarden, tags: docker }
 

+ 1 - 1
roles/bitwarden/tasks/main.yml

@@ -8,5 +8,5 @@
   community.docker.docker_compose_v2:
     project_src: /opt/bitwarden
     state: present
-    pull: true
+    pull: missing 
   register: output

+ 1 - 2
roles/docker1/tasks/main.yml

@@ -46,6 +46,5 @@
   community.docker.docker_compose_v2:
     project_src: /opt/portainer
     state: present
-    recreate: always
-    pull: always
+    pull: missing
   register: output

+ 0 - 7
roles/freebsd/tasks/main.yml

@@ -1,11 +1,4 @@
 ---
-- name: Install base packages
-  pkgng:
-    autoremove: true
-    cached: false
-    name: rsync,curl,htop
-    state: latest
-
 - name: Update all packages 
   pkgng:
     name: "*"

+ 1 - 0
roles/packages/tasks/main.yaml

@@ -9,6 +9,7 @@
     - python3-pip
     - acl
     - bash-completion
+    - python3-apt
 
 
 - name: install debian specific packages

+ 1 - 1
setup-hosts

@@ -1,2 +1,2 @@
 [debian]
-192.168.180.8 ansible_user=cmte
+192.168.100.15 ansible_user=cmte