[caddy] Update Caddyfile and fix playbook

ansible/roles/caddy/files/Caddyfile

@@ -1,28 +1,29 @@
-# pgadmin
 db.unbl.ink {
-    reverse_proxy 192.168.1.235:5050
+    reverse_proxy db.service:5050
 }
-
-# open postgres port
 db.unbl.ink:5432 {
-    reverse_proxy 192.168.1.235:5432
+    reverse_proxy db.service:5432
 }
-
-# gitea
-code.unbl.ink {
+code.unbl.ink { reverse_proxy git.service:3001
+}
+code.unbl.ink:222 {
     reverse_proxy git.service:3001
 }
-
-# dev mail frontend
+goat.cam.timberwyckfarm.com {
+    reverse_proxy webcams.service:8080
+}
+weather.cam.timberwyckfarm.com {
+    reverse_proxy webcams.service:8080
+}
+south.cam.timberwyckfarm.com {
+    reverse_proxy webcams.service:8081
+}
 mailhog.unbl.ink {
-    reverse_proxy 192.168.1.89
+    reverse_proxy fakemail.service:8025
 }
-# dev mail reciever
 mailhog.unbl.ink:1025 {
-    reverse_proxy 192.168.1.89:1025
+    reverse_proxy fakemail.service:1025
 }
-
-# matrix hub
 matrix.unbl.ink {
   reverse_proxy /.well-known/matrix/* 192.168.1.105:8008
   reverse_proxy /_matrix/* 192.168.1.105:8008
@@ -33,158 +34,95 @@ 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
-}
-
-photos.unbl.ink {
-    handle_path /api/* {
-        reverse_proxy photos.service:4001
-    }
-    handle {
-        reverse_proxy photos.service
-    }
-}
-# 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
+    reverse_proxy jellyfin.service:8096
 }
-# mpd access
-mpd.unbl.ink:6600 {
-    reverse_proxy mopidy.service:6600
-}
-
-
-# searx
-search.unbl.ink {
-    reverse_proxy search.service:4004
-}
-search.unbl.ink/_morty/ {
-    reverse_proxy search.service:3003
-}
-
-# 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
+jelly.unbl.ink {
+    reverse_proxy jellyfin.service:8096
 }
-
-# experimental jabber server
-xmpp.unbl.ink {
-    reverse_proxy xmpp.service:5280
+kodi.unbl.ink {
+    reverse_proxy kodi.service:8080
 }
-
-# grafana
-logs.unbl.ink {
-    reverse_proxy grafana.service:3002
+kodi.unbl.ink:9090 {
+    reverse_proxy kodi.service:9090
 }
-
-# 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
+    reverse_proxy fifteenfive.service
 }
 admin.five.unbl.ink {
-    reverse_proxy dev-ff.service
+    reverse_proxy fifteenfive.service
 }
 green.five.unbl.ink {
-    reverse_proxy dev-ff.service
+    reverse_proxy fifteenfive.service
 }
 bamboohr.five.unbl.ink {
-    reverse_proxy dev-ff.service
+    reverse_proxy fifteenfive.service
 }
 my.five.unbl.ink {
-    reverse_proxy dev-ff.service
+    reverse_proxy fifteenfive.service
 }
 auth.five.unbl.ink {
-    reverse_proxy dev-ff.service
+    reverse_proxy fifteenfive.service
 }
 okta.five.unbl.ink {
-    reverse_proxy dev-ff.service
+    reverse_proxy fifteenfive.service
 }
 jumpcloud.five.unbl.ink {
-    reverse_proxy dev-ff.service
+    reverse_proxy fifteenfive.service
 }
 sftp.five.unbl.ink {
-    reverse_proxy dev-ff.service
+    reverse_proxy fifteenfive.service
 }
 workday.five.unbl.ink {
-    reverse_proxy dev-ff.service
+    reverse_proxy fifteenfive.service
 }
-
-# webcams - changes a bit
-goat.cam.unbl.ink {
-    reverse_proxy 192.168.1.126:8080
+photos.unbl.ink {
+    reverse_proxy photos.service
 }
-pasture.cam.unbl.ink {
-    reverse_proxy 192.168.1.126:8081
+mpd.unbl.ink:6600 {
+    reverse_proxy mopidy.service:6600
 }
-garden.cam.unbl.ink {
-    reverse_proxy 192.168.1.126:8082
+play.unbl.ink {
+    reverse_proxy mopidy.service:6680
 }
-weather.cam.unbl.ink {
-    reverse_proxy rhea.service:8080
+stream.unbl.ink {
+    reverse_proxy mopidy.service:8000
 }
-goat.cam.timberwyckfarm.com {
-    reverse_proxy 192.168.1.126:8080
+search.unbl.ink {
+    reverse_proxy search.service:4004
+}
+search.unbl.ink/_morty/ {
+    reverse_proxy search.service:3000
 }
-pasture.cam.timberwyckfarm.com {
-    reverse_proxy 192.168.1.126:8081
+s3.unbl.ink {
+    reverse_proxy s3.service:9000
 }
-garden.cam.timberwyckfarm.com {
-    reverse_proxy 192.168.1.126:8082
+console.s3.unbl.ink {
+    reverse_proxy s3.service:9001
 }
-weather.cam.timberwyckfarm.com {
-    reverse_proxy rhea.service:8080
+podcasts.unbl.ink {
+    reverse_proxy podcasts.service:8004
+}
+rss.unbl.ink {
+    reverse_proxy rss.service:8002
+}
+wx.unbl.ink {
+    reverse_proxy wx.service
+    rewrite * /wx{uri}
+}
+null.unbl.ink {
+    reverse_proxy zerobin.service:3255
+}
+paper.unbl.ink {
+    reverse_proxy paperless.service
+}
+grist.unbl.ink {
+    reverse_proxy grist.service:8484
+}
+geoloc.unbl.ink {
+    reverse_proxy hauk.service
+    rewrite * /hauk{uri}
+}
+cook.unbl.ink {
+    reverse_proxy tandoor.service
 }

ansible/roles/caddy/tasks/main.yml

@@ -1,23 +1,23 @@
 ---
 - name: Package cache updated
   shell: pkg update -f
-  become: true
 
 - name: Caddy package installed
   community.general.pkgng:
     name: "caddy"
     state: latest
-  become: true
 
 - name: Caddy enabled
-  shell: sysrc caddy_enable="YES"
-  become: true
+  shell:
+    cmd: sysrc caddy_enable="YES"
 
 - name: Caddyfile installed
   copy:
     src: Caddyfile
-    dest: /usr/local/www/Caddyfile
+    dest: /usr/local/etc/caddy/Caddyfile
     owner: root
     mode: 0644
   notify: Caddy restarted
-  become: true
+
+- name: Caddy started
+  service: name=caddy state=started