Просмотр исходного кода

[ansible] Clean up hosts and playbook

Colin Powell 1 год назад
Родитель
Сommit
6c5540d3bb
2 измененных файлов с 30 добавлено и 54 удалено
  1. 26 48
      lab/ansible/hosts
  2. 4 6
      lab/ansible/playbook.yml

+ 26 - 48
lab/ansible/hosts

@@ -2,54 +2,32 @@
 rhea.local
 
 [jails]
-bastion1.local ansible_become=true
-bookwyrm0.local
-bookwyrm1.local
+bastion0.local
+unbound1.local
+navidrome1.local
+jellyfin0.local
+postgres0.local
+weewx0.local
+redis0.local
+minio0.local
+gogs1.local
+vrobbler1.local
+snapcast1.local
+mopidy1.local
+
 calibre1.local
-dendrite0.local
 devpi0.local
-elastic1.local
 emus0.local
-excalidraw1.local
 fifttrackee0.local
-gogs1.local
-hauk0.local
 icecast0.local
-jellyfin1.local
-kibana1.local
 linkace1.local
-logstash1.local
-mailhog0.local
-maloja1.local
-metabase1.local
 miniflux1.local
-minio1.local
-mongodb1.local
-mopidy0.local
-mopidy1.local
-navidrome0.local
-mpd1.local
 muchsync1.local
-ntfy1.local
 paperless1.local
-pg1-master.local
 photoview1.local
-pleroma1.local
 podgrab1.local
-prosody1.local
-redis1-master.local
-scratch0.local
-searxng1.local
-snapcast0.local
-sure-porchpals0.local
 syncthing.local
-tandoor0.local
-tor1.local
-unbound1.local
-vrobbler1.local
-weewx1.local
 wger0.local
-zerobin1.local
 
 [physical]
 rhea.local ansible_become=true
@@ -86,7 +64,7 @@ kari.local ansible_become=true
 [freebsd]
 paaliaq.local ansible_become=true
 kiviuq.local ansible_become=true
-bastion1.local ansible_become=true
+bastion0.local
 
 [mailinabox]
 box.unbl.ink
@@ -104,7 +82,7 @@ greip.unbl.ink
 unbound1.local
 
 [media]
-jellyfin1.local
+jellyfin0.local
 
 [mail]
 muchsync1.local
@@ -113,10 +91,10 @@ muchsync1.local
 gogs1.local
 
 [jump]
-bastion1.local ansible_become=true
+bastion0.local
 
 [proxy]
-bastion1.local ansible_become=true
+bastion0.local
 
 [matrix]
 dendrite0.local
@@ -146,7 +124,7 @@ tor1.local
 fifteenfive2.local
 
 [db]
-pg1-master.local
+postgres0.local
 
 [fakemail]
 mailhog0.local
@@ -155,7 +133,7 @@ mailhog0.local
 wger0.local
 
 [wx]
-weewx1.local
+weewx0.local
 
 [books]
 calibre1.local
@@ -182,10 +160,10 @@ elastic1.local
 logstash1.local
 
 [s3]
-minio1.local
+minio0.local
 
 [cache]
-redis1-master.local
+redis0.local
 
 [notify]
 ntfy1.local
@@ -194,16 +172,16 @@ ntfy1.local
 zerobin1.local
 
 [mopidy]
-mopidy0.local
+mopidy1.local
 
 [navidrome]
-navidrome0.local
+navidrome1.local
 
 [snapcast]
-snapcast0.local
+snapcast1.local
 
-[audio]
-mopidy0.local
+[vrobbler]
+vrobbler1.local
 
 [icecast]
 icecast0.local

+ 4 - 6
lab/ansible/playbook.yml

@@ -2,7 +2,6 @@
 - hosts: jails
   roles:
     - role: jails
-    - role: filebeat
 
 - hosts: dns
   roles:
@@ -84,11 +83,6 @@
     - role: beets
     - role: mopidy
 
-- hosts: navidrome
-  roles:
-    - role: immortal
-    - role: navidrome
-
 - hosts: snapcast
   roles:
     - role: immortal
@@ -217,6 +211,10 @@
     - role: immortal
     - role: scratch
 
+- hosts: navidrome
+  roles:
+    - role: navidrome
+
 - hosts: test
   roles:
     - role: direnv