Browse Source

[playbook] Renaming and reorg

Colin Powell 3 years ago
parent
commit
b6a494d29b
3 changed files with 129 additions and 76 deletions
  1. 13 7
      ansible/hosts
  2. 10 6
      ansible/playbook.yml
  3. 106 63
      ansible/roles/caddy/files/Caddyfile

+ 13 - 7
ansible/hosts

@@ -113,17 +113,14 @@ searx.local
 [rss]
 miniflux.local
 
-[tor]
+[private]
 tor.local
 
-[invidious]
-invidious.local
-
 [pbp]
 pbp.local
 
-[fifteen5]
-fifteen5.local
+[five]
+dev-ff.local
 
 [db]
 db.local
@@ -131,7 +128,7 @@ db.local
 [dev_mail]
 mailhog.local
 
-[weather]
+[wx]
 wx.local
 kiviuq.local ansible_become=true
 
@@ -146,3 +143,12 @@ podcasts.local
 
 [logs]
 grafana.local
+
+[s3]
+minio.local
+
+[meet]
+galene.local
+
+[cache]
+redis.local

+ 10 - 6
ansible/playbook.yml

@@ -33,18 +33,18 @@
     - role: supervisor
     - role: pbp
 
-- hosts: fifteen5
+- hosts: five
   roles:
     - role: supervisor
     - role: syncthing
     - role: nginx
     - role: fifteen5
 
-- hosts: searx
+- hosts: search
   roles:
     - role: searx
 
-- hosts: weather
+- hosts: wx
   roles:
     - role: nginx
     - role: weewx
@@ -71,7 +71,7 @@
   roles:
     - role: podgrab
 
-- hosts: mopidy
+- hosts: play
   roles:
     - role: mopidy
 
@@ -79,7 +79,7 @@
   roles:
     - role: 0bin
 
-- hosts: redis
+- hosts: cache
   roles:
     - role: redis
 
@@ -87,6 +87,10 @@
   roles:
     - role: elasticsearch
 
-- hosts: galene
+- hosts: meet
   roles:
     - role: galene
+
+- hosts: s3
+  roles:
+    - role: minio

+ 106 - 63
ansible/roles/caddy/files/Caddyfile

@@ -1,42 +1,28 @@
+# pgadmin
 db.unbl.ink {
     reverse_proxy 192.168.1.235:5050
 }
+
+# open postgres port
 db.unbl.ink:5432 {
     reverse_proxy 192.168.1.235:5432
 }
+
+# gitea
 code.unbl.ink {
     reverse_proxy 192.168.1.239:3000
 }
-goat.cam.unbl.ink {
-    reverse_proxy 192.168.1.126:8080
-}
-pasture.cam.unbl.ink {
-    reverse_proxy 192.168.1.126:8081
-}
-garden.cam.unbl.ink {
-    reverse_proxy 192.168.1.126:8082
-}
-weather.cam.unbl.ink {
-    reverse_proxy rhea.service:8080
-}
-goat.cam.timberwyckfarm.com {
-    reverse_proxy 192.168.1.126:8080
-}
-pasture.cam.timberwyckfarm.com {
-    reverse_proxy 192.168.1.126:8081
-}
-garden.cam.timberwyckfarm.com {
-    reverse_proxy 192.168.1.126:8082
-}
-weather.cam.timberwyckfarm.com {
-    reverse_proxy rhea.service:8080
-}
+
+# dev mail frontend
 mailhog.unbl.ink {
     reverse_proxy 192.168.1.89
 }
+# dev mail reciever
 mailhog.unbl.ink:1025 {
     reverse_proxy 192.168.1.89:1025
 }
+
+# matrix hub
 matrix.unbl.ink {
   reverse_proxy /.well-known/matrix/* 192.168.1.105:8008
   reverse_proxy /_matrix/* 192.168.1.105:8008
@@ -47,45 +33,17 @@ matrix.unbl.ink {
 matrix.unbl.ink:8448 {
   reverse_proxy 192.168.1.105:8008
 }
+
+# jellyfin
 media.unbl.ink {
     reverse_proxy 192.168.1.178:8096
 }
+
+# pixelfed
 pixel.unbl.ink {
     reverse_proxy pixelfed.service
 }
-unblink.five.unbl.ink {
-    reverse_proxy dev-ff.service:8000
-}
-admin.five.unbl.ink {
-    reverse_proxy dev-ff.service:8000
-}
-green.five.unbl.ink {
-    reverse_proxy dev-ff.service:8000
-}
-bamboohr.five.unbl.ink {
-    reverse_proxy dev-ff.service:8000
-}
-my.five.unbl.ink {
-    reverse_proxy dev-ff.service:8000
-}
-auth.five.unbl.ink {
-    reverse_proxy dev-ff.service:8000
-}
-okta.five.unbl.ink {
-    reverse_proxy dev-ff.service:8000
-}
-jumpcloud.five.unbl.ink {
-    reverse_proxy dev-ff.service:8000
-}
-sftp.five.unbl.ink {
-    reverse_proxy dev-ff.service:8000
-}
-workday.five.unbl.ink {
-    reverse_proxy dev-ff.service:8000
-}
-sftp-workday.five.unbl.ink {
-    reverse_proxy dev-ff.service:8000
-}
+
 photos.unbl.ink {
     handle_path /api/* {
         reverse_proxy photos.service:4001
@@ -94,57 +52,142 @@ photos.unbl.ink {
         reverse_proxy photos.service
     }
 }
-mpd.unbl.ink:6600 {
-    reverse_proxy mopidy.service:6600
-}
+# mathesar api
 mathesar.unbl.ink:3000 {
     reverse_proxy mathesar.service:3000
 }
+# mathesar app
 mathesar.unbl.ink {
     reverse_proxy mathesar.service:8000
 }
+
+# mopidy
 play.unbl.ink {
     reverse_proxy mopidy.service:6680
 }
+# icecast
 stream.unbl.ink {
     reverse_proxy mopidy.service:8000
 }
+# mpd access
+mpd.unbl.ink:6600 {
+    reverse_proxy mopidy.service:6600
+}
+
+
+# searx
 search.unbl.ink {
     reverse_proxy 192.168.1.113:4004
 }
 search.unbl.ink/_morty/ {
     reverse_proxy 192.168.1.113:3000
 }
+
+# galene
 meet.unbl.ink {
     reverse_proxy galene.service:8443
 }
+
+# minio
 s3.unbl.ink {
     reverse_proxy minio.service:9000
 }
+
+# podgrab
 podcasts.unbl.ink {
     reverse_proxy podcasts.service:8080
 }
+
+# miniflux
 rss.unbl.ink {
     reverse_proxy 192.168.1.117:8080
 }
+
+# weewx
 wx.unbl.ink {
     reverse_proxy wx.service
 }
+
+# experimental jabber server
 xmpp.unbl.ink {
     reverse_proxy xmpp.service:5280
 }
-sentry.unbl.ink {
-    reverse_proxy 192.168.1.215:9000
-}
+
+# grafana
 logs.unbl.ink {
     reverse_proxy grafana.service:3000
 }
+
+# crater
 invoices.unbl.ink {
     reverse_proxy crater.service
 }
+
+# 0bin
 null.unbl.ink {
     reverse_proxy 0bin.service:3255
 }
 funk.unbl.ink {
     reverse_proxy funkwhale.service
 }
+
+# fifteen5
+unblink.five.unbl.ink {
+    reverse_proxy dev-ff.service:8000
+}
+admin.five.unbl.ink {
+    reverse_proxy dev-ff.service:8000
+}
+green.five.unbl.ink {
+    reverse_proxy dev-ff.service:8000
+}
+bamboohr.five.unbl.ink {
+    reverse_proxy dev-ff.service:8000
+}
+my.five.unbl.ink {
+    reverse_proxy dev-ff.service:8000
+}
+auth.five.unbl.ink {
+    reverse_proxy dev-ff.service:8000
+}
+okta.five.unbl.ink {
+    reverse_proxy dev-ff.service:8000
+}
+jumpcloud.five.unbl.ink {
+    reverse_proxy dev-ff.service:8000
+}
+sftp.five.unbl.ink {
+    reverse_proxy dev-ff.service:8000
+}
+workday.five.unbl.ink {
+    reverse_proxy dev-ff.service:8000
+}
+sftp-workday.five.unbl.ink {
+    reverse_proxy dev-ff.service:8000
+}
+
+# webcams - changes a bit
+goat.cam.unbl.ink {
+    reverse_proxy 192.168.1.126:8080
+}
+pasture.cam.unbl.ink {
+    reverse_proxy 192.168.1.126:8081
+}
+garden.cam.unbl.ink {
+    reverse_proxy 192.168.1.126:8082
+}
+weather.cam.unbl.ink {
+    reverse_proxy rhea.service:8080
+}
+goat.cam.timberwyckfarm.com {
+    reverse_proxy 192.168.1.126:8080
+}
+pasture.cam.timberwyckfarm.com {
+    reverse_proxy 192.168.1.126:8081
+}
+garden.cam.timberwyckfarm.com {
+    reverse_proxy 192.168.1.126:8082
+}
+weather.cam.timberwyckfarm.com {
+    reverse_proxy rhea.service:8080
+}