瀏覽代碼

[ansible] Update hosts and playbook

Colin Powell 3 年之前
父節點
當前提交
fcc9c96e72
共有 2 個文件被更改,包括 35 次插入45 次删除
  1. 16 41
      ansible/hosts
  2. 19 4
      ansible/playbook.yml

+ 16 - 41
ansible/hosts

@@ -1,22 +1,6 @@
 [jails]
-bastion.local ansible_become=true
-wx0.local
-postgres-master.local
-redis-master.local
-minio0.local
+bastion1.local ansible_become=true
 muchsync0.local
-gogs0.local
-fifteenfive0.local
-mailhog0.local
-tor0.local
-calibreweb0.local
-podgrab0.local
-jellyfin0.local
-photoview0.local
-searx0.local
-unbound0.local
-zerobin0.local
-tandoor0.local
 # New rhea jails
 searx1.local
 minio1.local
@@ -26,14 +10,12 @@ gogs1.local
 fifteenfive1.local
 mailhog1.local
 tor1.local
-calibreweb1.local
 podgrab1.local
 jellyfin1.local
 photoview1.local
 searx1.local
 unbound1.local
 zerobin1.local
-tandoor1.local
 weewx1.local
 pg1-master.local
 elastic1.local
@@ -41,9 +23,8 @@ logstash1.local
 kibana1.local
 redis1-master.local
 hauk1.local
-
-[bhyve]
-mopidy.local ansible_become=true
+icecast1.local
+test2.local
 
 [physical]
 rhea.local ansible_become=true
@@ -57,6 +38,7 @@ kiviuq.local ansible_become=true
 kari.local ansible_become=true
 atlas.local ansible_become=true
 skoll.local ansible_become=true
+siarnaq.local ansible_become=true
 
 [hosted]
 box.unbl.ink
@@ -66,6 +48,7 @@ pandora.unbl.ink
 [ubuntu]
 mopidy.local ansible_become=true
 kari.local ansible_become=true
+siarnaq.local ansible_become=true
 box.unbl.ink
 box.castine.town
 pandora.unbl.ink
@@ -78,23 +61,7 @@ bastion0.local ansible_become=true
 search0.local
 muchsync0.local
 dev-pbp.local
-wx0.local
-photoview0.local
 timelapse.local
-postgres-master.local
-redis-master.local
-minio0.local
-gogs0.local
-fifteenfive0.local
-mailhog0.local
-tor0.local
-calibreweb0.local
-podgrab0.local
-jellyfin0.local
-photoview0.local
-searx0.local
-unbound0.local
-zerobin0.local
 tandoor0.local
 searx1.local
 minio1.local
@@ -119,6 +86,8 @@ logstash1.local
 kibana1.local
 redis1-master.local
 hauk1.local
+bastion1.local ansible_become=true
+icecast1.local
 
 [mailinabox]
 box.unbl.ink
@@ -145,10 +114,10 @@ muchsync1.local
 gogs1.local
 
 [jump]
-bastion1.local
+bastion1.local ansible_become=true
 
 [proxy]
-bastion1.local
+bastion1.local ansible_become=true
 
 [matrix]
 matrix.local
@@ -218,7 +187,7 @@ redis1-master.local
 timelapse.local
 
 [test]
-test.local
+test2.local
 
 [pastebin]
 zerobin1.local
@@ -242,3 +211,9 @@ nomad-agent1.local
 [nomad-agents-dc2]
 nomad-agent2.local
 nomad-agent3.local
+
+[mopidy]
+siarnaq.local ansible_become=true
+
+[icecast]
+icecast1.local

+ 19 - 4
ansible/playbook.yml

@@ -33,11 +33,13 @@
 
 - hosts: pbp
   roles:
+    - role: direnv
     - role: supervisor
     - role: pbp
 
 - hosts: fifteenfive
   roles:
+    - role: direnv
     - role: supervisor
     - role: syncthing
     - role: nginx
@@ -80,10 +82,14 @@
   roles:
     - role: podgrab
 
-- hosts: play
+- hosts: mopidy
   roles:
     - role: mopidy
 
+- hosts: icecast
+  roles:
+    - role: icecast
+
 - hosts: pastebin
   roles:
     - role: 0bin
@@ -152,9 +158,10 @@
 
 - hosts: test
   roles:
+    - role: direnv
+    - role: immortal
     - role: jails
-    - role: grafana
-    - role: loki
+    - role: tandoor
     - role: nginx
     - role: galene
     - role: searx
@@ -169,4 +176,12 @@
     - role: mailhog
     - role: unbound
     - role: postgres
-    - role: pgadmin4
+    - role: elasticsearch
+    - role: logstash
+    - role: kibana
+    - role: icecast
+    - role: hauk
+    - role: miniflux
+    - role: pbp
+    - role: fifteen5
+    - role: photoview