[roles] Big update for pythone 311 and little tweaks

lab/ansible/group_vars/snapcast

@@ -0,0 +1,4 @@
+silence_snap_port: 4000
+mopidy_snap_port: 4001
+computer_snap_port: 4002
+

lab/ansible/hosts

@@ -3,17 +3,18 @@ rhea.local
 
 [jails]
 bastion0.local
-unbound1.local
+unbound0.local
 navidrome1.local
 jellyfin0.local
 postgres0.local
+pgadmin0.local
 weewx0.local
 redis0.local
 minio0.local
-gogs1.local
+gogs0.local
 vrobbler1.local
-snapcast1.local
-mopidy1.local
+snapcast0.local
+mopidy0.local
 miniflux0.local
 podgrab0.local
 emus0.local
@@ -80,7 +81,7 @@ pandora.unbl.ink
 greip.unbl.ink
 
 [dns]
-unbound1.local
+unbound0.local
 
 [media]
 jellyfin0.local
@@ -89,7 +90,7 @@ jellyfin0.local
 muchsync1.local
 
 [git]
-gogs1.local
+gogs0.local
 
 [jump]
 bastion0.local
@@ -176,13 +177,13 @@ ntfy1.local
 zerobin1.local
 
 [mopidy]
-mopidy1.local
+mopidy0.local
 
 [navidrome]
 navidrome1.local
 
 [snapcast]
-snapcast1.local
+snapcast0.local
 
 [vrobbler]
 vrobbler1.local

lab/ansible/roles/caddy/files/Caddyfile

@@ -25,24 +25,6 @@ ci.lab.unbl.ink {
     reverse_proxy drone.service
 }
 
-yard.see.unbl.ink {
-    reverse_proxy laptop.service:8083
-}
-board.see.unbl.ink {
-    reverse_proxy laptop.service:8082
-}
-basement1.see.unbl.ink {
-    reverse_proxy laptop.service:8081
-}
-basement2.see.unbl.ink {
-    reverse_proxy 192.168.40.20:8081
-}
-dining.see.unbl.ink {
-    reverse_proxy 192.168.40.208:8082
-}
-mail.see.unbl.ink {
-    reverse_proxy 192.168.40.208:8081
-}
 move.see.timberwyckfarm.com {
     reverse_proxy https://192.168.40.228 {
         transport http {
@@ -132,3 +114,34 @@ queue.lab.unbl.ink {
 stream.lab.unbl.ink {
     reverse_proxy icecast.service:8010
 }
+
+backyard.see.unbl.ink {
+    reverse_proxy mundilfari.local:8081
+}
+extension.see.unbl.ink {
+    reverse_proxy linux.service:8082
+}
+backyard-high.see.unbl.ink {
+    reverse_proxy linux.service:8083
+}
+dining.see.unbl.ink {
+    reverse_proxy kari.local:8082
+}
+basement.see.unbl.ink {
+    reverse_proxy localhost:8081
+}
+front.see.unbl.ink {
+    reverse_proxy localhost:8082
+}
+table.see.unbl.ink {
+    reverse_proxy localhost:8083
+}
+mail.see.unbl.ink {
+    reverse_proxy ymir.local:8080
+}
+basement-low.see.unbl.ink {
+    reverse_proxy ymir.local:8081
+}
+house.see.unbl.ink {
+    reverse_proxy ymir.local:8082
+}

lab/ansible/roles/calibre-web/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: Dependencies installed
   community.general.pkgng:
-    name: py38-pip,rust,libxslt,libxml2
+    name: py311-pip,rust,libxslt,libxml2
     state: latest
 
 - name: Calibre-Web installed

lab/ansible/roles/emus/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: Dependencies installed
   community.general.pkgng:
-    name: py311-pip,jpeg-turbo,tiff,webp,lcms2,freetype2,cairo,pango,rust,postgresql13-client
+    name: py311-pip,py311-cryptography,jpeg-turbo,tiff,webp,lcms2,freetype2,cairo,pango,rust,postgresql13-client
     state: latest
 
 - name: Static files folder exists

lab/ansible/roles/miniflux/tasks/main.yml

@@ -5,7 +5,7 @@
     state: latest
 
 - name: Miniflux enabled
-  shell: sysrc immortaldir_enable="YES"
+  shell: sysrc miniflux_enable="YES"
   notify: Miniflux restarted
 
 - name: Miniflux config installed

lab/ansible/roles/mopidy/tasks/main.yml

@@ -6,7 +6,7 @@
 
 - name: Mopidy plugins installed
   pip:
-    name: mopidy,mopidy-bandcamp,mopidy-soundcloud,mopidy-mpd,mopidy-Iris,mopidy-tunein,mopidy-local,mopidy-scrobbler,mopidy-mowecl,mopidy-musicbox-webclient,mopidy-party,mopidy-muse,mopidy-Lagukan,mopidy-somafm,mopidy-internetarchive
+    name: mopidy,mopidy-bandcamp,mopidy-soundcloud,mopidy-mpd,mopidy-Iris,mopidy-tunein,mopidy-local,mopidy-mowecl,mopidy-musicbox-webclient,mopidy-party,mopidy-muse,mopidy-Lagukan,mopidy-somafm,mopidy-internetarchive
     state: latest
 
 - name: Install webhooks

lab/ansible/roles/mopidy/templates/mopidy.conf.j2

@@ -79,13 +79,13 @@ identity: {{mopidy_bandcamp_identity}}
 
 [webhooks]
 enabled = true
-urls = http://vrobbler.service/api/v1/scrobbles/mopidy/
+urls = https://life.unbl.ink/webhook/mopidy/
 tokens = {{vrobbler_webhook_token}}
 
 [lagukan]
 autostart = false
 
 [audio]
-output = audioresample ! rgvolume ! audioconvert ! audio/x-raw,rate=48000,channels=2,format=S16LE ! wavenc ! tcpclientsink host=snapcast.service port=4098 async=False
+output = audioresample ! rgvolume ! audioconvert ! audio/x-raw,rate=48000,channels=2,format=S16LE ! wavenc ! tcpclientsink host=snapcast.service port=4001 async=False
 #output = lamemp3enc ! shout2send async=false mount=mopidy ip=icecast1.local port=8010 password=mainr0ot
 #output = tee name=t ! queue ! audioresample ! audio/x-raw,rate=48000,channels=2,format =S16LE ! audioconvert ! wavenc ! filesink location=/tmp/snapfifo t. ! queue ! lamemp3enc ! shout2send async=false mount=mopidy ip=icecast1.local port=8010 password=mainr0ot

lab/ansible/roles/ntfy/tasks/main.yml

@@ -3,11 +3,3 @@
   community.general.pkgng:
     name: ntfy
     state: latest
-
-- name: ntfy enabled
-  shell: sysrc ntfy_enable="YES"
-
-- name: Ensure ntfy is running
-  service:
-    name: navidrome
-    state: started

lab/ansible/roles/paperless/tasks/main.yml

@@ -1,26 +1,9 @@
 ---
 - name: Dependencies installed
   community.general.pkgng:
-    name: git,rust,py38-cffi,py38-cryptography,py38-lxml,py38-joblib,py38-numpy,py38-pip,py38-pycparser,py38-pyinotify,py38-scikit-learn,py38-scipy,py38-setuptools,py38-six,py38-sqlite3,python38,py38-psycopg,ImageMagick7-nox11,mime-support,optipng,gnupg,liberation-fonts-ttf,xorg-fonts-truetype,unpaper,ghostscript9-base,qpdf,icc-profiles-adobe-cs4,icc-profiles-openicc,icc-profiles-basiccolor,libxml2,pngquant,tesseract,go,gnuplot,chromium,pdftk,libreoffice,unoconv,npm
+    name: py311-paperless-ngx
     state: latest
 
-- name: Paperless-ng source cloned
-  git:
-    repo: "https://github.com/jonaswinkler/paperless-ng"
-    dest: /usr/local/src/paperless-ng/
-    update: yes
-    force: yes
-
-- name: Scikit and scipy commented out of requierments
-  shell:
-    chdir: /usr/local/src/paperless-ng
-    cmd: 'sed -i -e "/scikit/d"  requirements.txt && sed -i -e "/scipy/d" requirements.txt'
-
-- name: Requirements up to date
-  pip:
-    requirements: /usr/local/src/paperless-ng/requirements.txt
-    executable: pip
-
 - name: Nginx location file installed
   copy:
     src: nginx-location.conf
@@ -35,17 +18,6 @@
     owner: root
     mode: 0644
 
-- name: Paperless frontend built
-  shell:
-    cmd: setenv NG_CLI_ANALYTICS ci && npm install && ./node_modules/.bin/ng build --prod
-    chdir: /usr/local/src/paperless/src-ui
-
-- name: Paperless migrations up to date
-  command: python3.8 /usr/local/src/paperless-ng/src/manage.py migrate
-
-- name: Paperless static files copied
-  command: python3.8 /usr/local/src/paperless-ng/src/manage.py collectstatic --noinput
-
 - name: Gotenberg source cloned
   git:
     repo: "https://github.com/gotenberg/gotenberg.git"
@@ -67,7 +39,7 @@
 
 - name: Tika server installed
   get_url:
-    url: https://dlcdn.apache.org/tika/2.3.0/tika-server-standard-2.3.0.jar
+    url: https://dlcdn.apache.org/tika/2.9.2/tika-server-standard-2.9.2.jar
     dest: /usr/local/bin/
     mode: a+x
 

lab/ansible/roles/podgrab/files/podgrab.rc

@@ -6,7 +6,7 @@
 export DATA="/var/podgrab/assets"
 export CONFIG="/var/podgrab/config"
 export GIN_MODE="release"
-export CHECK_FREQUENCY=240
+export CHECK_FREQUENCY=30
 export PORT=8004
 cd /var/podgrab
 PODGRAB_BIN="/usr/local/bin/podgrab"

lab/ansible/roles/podgrab/tasks/main.yml

@@ -49,6 +49,12 @@
 - name: Podgrab rc file installed
   ansible.builtin.copy:
     src: podgrab.rc
-    dest: /usr/local/etc/rc.d/podgrab
+    dest: /etc/rc.d/podgrab
     mode: a+x
   notify: Podgrab restarted
+
+- name: Podgrab enabled
+  shell: sysrc podgrab_enable="YES"
+
+- name: Podgrab started
+  service: name=podgrab state=started

lab/ansible/roles/postgres/tasks/main.yml

@@ -1,13 +1,7 @@
 ---
 - name: PostgreSQL packages installed
   community.general.pkgng:
-<<<<<<< HEAD
-    name: postgresql13-server,postgresql13-client,postgresql13-contrib,py39-pip,rsync
-||||||| parent of 58e8892 (Update so most of these actually run)
-    name: postgresql14-server,postgresql14-client,postgresql14-contrib,py39-pip,rsync
-=======
-    name: postgresql16-server,postgresql16-client,postgresql16-contrib,py311-pip,rsync
->>>>>>> 58e8892 (Update so most of these actually run)
+    name: postgresql17-server,postgresql17-client,postgresql17-contrib,py311-pip,rsync
     state: latest
 
 - name: Psycopg2 installed
@@ -17,13 +11,7 @@
   shell: sysrc postgresql_enable="YES"
 
 - name: Postgres initialized
-<<<<<<< HEAD
-  shell: initdb --pgdata=/var/db/postgres/data13
-||||||| parent of 58e8892 (Update so most of these actually run)
-  shell: initdb --pgdata=/var/db/postgres/data14
-=======
-  shell: initdb --pgdata=/var/db/postgres/data16
->>>>>>> 58e8892 (Update so most of these actually run)
+  shell: initdb --pgdata=/var/db/postgres/data17
   become: yes
   become_method: su
   become_user: postgres
@@ -32,13 +20,7 @@
 - name: Postgres access file patched
   patch:
     src: pg_hba.conf.patch
-<<<<<<< HEAD
-    dest: /var/db/postgres/data13/pg_hba.conf
-||||||| parent of 58e8892 (Update so most of these actually run)
-    dest: /var/db/postgres/data14/pg_hba.conf
-=======
-    dest: /var/db/postgres/data16/pg_hba.conf
->>>>>>> 58e8892 (Update so most of these actually run)
+    dest: /var/db/postgres/data17/pg_hba.conf
   become: yes
   become_method: su
   become_user: postgres
@@ -47,13 +29,7 @@
 - name: Postgres config file patched
   patch:
     src: postgresql.conf.patch
-<<<<<<< HEAD
-    dest: /var/db/postgres/data13/postgresql.conf
-||||||| parent of 58e8892 (Update so most of these actually run)
-    dest: /var/db/postgres/data14/postgresql.conf
-=======
-    dest: /var/db/postgres/data16/postgresql.conf
->>>>>>> 58e8892 (Update so most of these actually run)
+    dest: /var/db/postgres/data17/postgresql.conf
   become: yes
   become_method: su
   become_user: postgres
@@ -61,25 +37,13 @@
 
 - name: Postgres config file permissions fixed
   file:
-<<<<<<< HEAD
-    path: /var/db/postgres/data13/postgresql.conf
-||||||| parent of 58e8892 (Update so most of these actually run)
-    path: /var/db/postgres/data14/postgresql.conf
-=======
-    path: /var/db/postgres/data16/postgresql.conf
->>>>>>> 58e8892 (Update so most of these actually run)
+    path: /var/db/postgres/data17/postgresql.conf
     owner: postgres
     group: postgres
 
 - name: Pg_hba config file permissions fixed
   file:
-<<<<<<< HEAD
-    path: /var/db/postgres/data13/pg_hba.conf
-||||||| parent of 58e8892 (Update so most of these actually run)
-    path: /var/db/postgres/data14/pg_hba.conf
-=======
-    path: /var/db/postgres/data16/pg_hba.conf
->>>>>>> 58e8892 (Update so most of these actually run)
+    path: /var/db/postgres/data17/pg_hba.conf
     owner: postgres
     group: postgres
 

lab/ansible/roles/snapcast/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: Dependencies installed
   community.general.pkgng:
-    name: "snapcast"
+    name: snapcast,shairport-sync
     state: latest
 
 - name: Snapserver conf file installed
@@ -19,3 +19,11 @@
     owner: root
     mode: 0600
   notify: Immortal restarted
+
+- name: NqPTP enabled
+  shell: sysrc nqptp_enable="YES"
+
+- name: Ensure nqptp is running
+  service:
+    name: nqptp
+    state: started

lab/ansible/roles/snapcast/templates/snapserver.conf.j2

@@ -1,13 +1,9 @@
 [stream]
 bind_to_address = 0.0.0.0
 port = 1704
-source = tcp://0.0.0.0:{{silence_snap_port}}?name=silence
-source = tcp://0.0.0.0:{{spotify_snap_port}}?name=spotify
-source = tcp://0.0.0.0:{{mopidy_snap_port}}?name=mopidy
-source = tcp://0.0.0.0:{{dev_snap_port}}?name=mopidy-dev
-source = tcp://0.0.0.0:{{computer_snap_port}}?name=computer
-source = tcp://0.0.0.0:{{kids_snap_port}}?name=kids
-source = airplay:///localhost?name=airplay
+source = tcp://0.0.0.0:{{silence_snap_port}}?name=Silence
+source = tcp://0.0.0.0:{{mopidy_snap_port}}?name=Mopidy
+source = tcp://0.0.0.0:{{computer_snap_port}}?name=Computer
 codec = flac
 send_to_muted = false
 

lab/ansible/roles/tandoor/tasks/main.yml

@@ -34,29 +34,6 @@
     owner: root
     mode: 0644
 
-<<<<<<< HEAD
-- name: Libraries for ldap linked
-  file: src=/usr/local/include/lber.h dest=/usr/include/lber.h state=link
-
-- name: Libraries for ldap linked
-  file: src=/usr/local/include/lber_types.h dest=/usr/include/lber_types.h state=link
-
-- name: Libraries for ldap linked
-  file: src=/usr/local/include/ldap_cdefs.h dest=/usr/include/ldap_cdefs.h state=link
-
-- name: Libraries for ldap linked
-  file: src=/usr/local/include/ldap_features.h dest=/usr/include/ldap_features.h state=link
-
-- name: Libraries for ldap linked
-  file: src=/usr/local/include/ldap.h dest=/usr/include/ldap.h state=link
-
-- name: Libraries for ldap linked
-  file: src=/usr/local/include/openldap.h dest=/usr/include/openldap.h state=link
-
-- name: Libraries for sasl linked
-  file: src=/usr/local/include/sasl dest=/usr/include/sasl state=link
-
-||||||| parent of 58e8892 (Update so most of these actually run)
 - name: Libraries for ldap linked
   file: src=/usr/local/include/lber.h dest=/usr/include/lber.h state=link
 
@@ -72,8 +49,6 @@
 - name: Libraries for sasl linked
   file: src=/usr/local/include/sasl dest=/usr/include/sasl state=link
 
-=======
->>>>>>> 58e8892 (Update so most of these actually run)
 
 - name: Tandoor requirements up to date
   pip:

lab/ansible/roles/unbound/files/service.zones

@@ -1,28 +1,23 @@
 private-domain: "service."
 local-zone: "service." static
-local-data: "dns.service        IN      A       192.168.1.205"
-local-data: "nfs.service        IN      A       192.168.40.143"
-local-data: "webcams.service    IN      A       192.168.40.157"
+local-data: "dns.service        IN      A       192.168.40.24"
+local-data: "bastion.service    IN      A       192.168.40.83"
+local-data: "snapcast.service   IN      A       192.168.40.124"
+local-data: "mopidy.service     IN      A       192.168.40.193"
+local-data: "nfs.service        IN      A       192.168.40.142"
+local-data: "git.service        IN      A       192.168.40.244"
+local-data: "db.service         IN      A       192.168.40.145"
+local-data: "rss.service        IN      A       192.168.40.146"
+local-data: "jellyfin.service   IN      A       192.168.40.185"
+local-data: "linux.service      IN      A       192.168.40.185"
+local-data: "podcasts.service   IN      A       192.168.40.47"
+
 local-data: "pallene.service    IN      A       192.168.40.236"
-local-data: "bastion.service    IN      A       192.168.40.169"
 local-data: "gw100.service      IN      A       192.168.40.180"
 local-data: "wx.service         IN      A       192.168.40.252"
 local-data: "s3.service         IN      A       192.168.40.113"
 local-data: "cache.service      IN      A       192.168.40.21"
-local-data: "db.service         IN      A       192.168.40.150"
-local-data: "jellyfin.service   IN      A       192.168.40.209"
-local-data: "logs.service       IN      A       192.168.40.206"
-local-data: "archive.service    IN      A       192.168.40.206"
-local-data: "snapcast.service   IN      A       192.168.40.56"
-local-data: "git.service        IN      A       192.168.40.142"
-local-data: "mopidy.service     IN      A       192.168.40.68"
-local-data: "mopidy2.service    IN      A       192.168.40.68"
-local-data: "vrobbler.service   IN      A       192.168.40.31"
-local-data: "syncthing.service  IN      A       192.168.40.91"
-local-data: "podcasts.service   IN      A       192.168.40.132"
-local-data: "rss.service        IN      A       192.168.40.151"
-local-data: "drone.service      IN      A       192.168.40.206"
-local-data: "navidrome.service  IN      A       192.168.40.45"
+local-data: "drone.service      IN      A       192.168.40.208"
 local-data: "librespot.service  IN      A       192.168.40.34"
 local-data: "calibre.service    IN      A       192.168.40.76"
 local-data: "emus.service       IN      A       192.168.40.163"

lab/ansible/roles/unbound/files/unblink.zones

@@ -5,33 +5,37 @@ local-data: "www.unbl.ink	    IN	    A   	142.93.153.227"
 local-data: "greip.unbl.ink     IN      A       198.244.198.117"
 local-data: "bt1.unbl.ink       IN      A       198.244.198.117"
 local-data: "bt2.unbl.ink       IN      A       198.12.85.133"
+local-data: "life.unbl.ink      IN      A       67.205.184.201"
+local-data: "ntfy.unbl.ink	    IN  	A 	    147.182.174.4"
 local-data: "pandora.unbl.ink   IN      A       198.12.85.133"
-local-data: "dns.unbl.ink       IN      A       192.168.40.205"
-local-data: "cache.unbl.ink     IN      A       192.168.40.21"
-local-data: "code.unbl.ink      IN	    A	    192.168.40.169"
-local-data: "photos.unbl.ink    IN      A       192.168.40.169"
-local-data: "play.unbl.ink      IN      A       192.168.40.169"
-local-data: "snap.unbl.ink      IN      A       192.168.40.169"
-local-data: "s3.unbl.ink        IN      A       192.168.40.169"
-local-data: "wx.unbl.ink        IN      A       192.168.40.169"
-local-data: "jelly.unbl.ink     IN      A       192.168.40.169"
-local-data: "paper.unbl.ink     IN      A       192.168.40.169"
-local-data: "notify.unbl.ink    IN      A       192.168.40.169"
-local-data: "fit.unbl.ink       IN      A       192.168.40.169"
-local-data: "run.unbl.ink       IN      A       192.168.40.169"
-local-data: "links.unbl.ink     IN      A       192.168.40.169"
-local-data: "bastion.unbl.ink   IN      A       192.168.40.169"
-local-data: "ko.lab.unbl.ink    IN      A       192.168.40.169"
-local-data: "db.lab.unbl.ink    IN      A       192.168.40.169"
-local-data: "music.lab.unbl.ink IN      A       192.168.40.169"
-local-data: "emus.lab.unbl.ink	IN	    A	    192.168.40.169"
-local-data: "play.lab.unbl.ink	IN	    A	    192.168.40.169"
-local-data: "rss.lab.unbl.ink   IN      A       192.168.40.169"
-local-data: "east.cam.unbl.ink  IN      A       192.168.40.169"
-local-data: "west.cam.unbl.ink  IN      A       192.168.40.169"
-local-data: "ci.lab.unbl.ink              IN    A        192.168.40.169"
-local-data: "podcasts.lab.unbl.ink  	  IN    A        192.168.40.169"
-local-data: "console.s3.unbl.ink   	      IN    A        192.168.40.169"
-local-data: "vrobbler.lab.unbl.ink        IN    A   	 192.168.40.169"
-local-data: "library.lab.unbl.ink         IN	A   	 192.168.40.169"
+local-data: "dns.unbl.ink       IN      A       192.168.40.24"
+local-data: "cache.unbl.ink     IN      A       192.168.40.46"
+local-data: "code.unbl.ink      IN	    A	    192.168.40.46"
+local-data: "photos.unbl.ink    IN      A       192.168.40.46"
+local-data: "play.unbl.ink      IN      A       192.168.40.46"
+local-data: "snap.unbl.ink      IN      A       192.168.40.46"
+local-data: "s3.unbl.ink        IN      A       192.168.40.46"
+local-data: "wx.unbl.ink        IN      A       192.168.40.46"
+local-data: "jelly.unbl.ink     IN      A       192.168.40.46"
+local-data: "paper.unbl.ink     IN      A       192.168.40.46"
+local-data: "notify.unbl.ink    IN      A       192.168.40.46"
+local-data: "fit.unbl.ink       IN      A       192.168.40.46"
+local-data: "run.unbl.ink       IN      A       192.168.40.46"
+local-data: "links.unbl.ink     IN      A       192.168.40.46"
+local-data: "bastion.unbl.ink   IN      A       192.168.40.46"
+local-data: "ko.lab.unbl.ink    IN      A       192.168.40.46"
+local-data: "db.lab.unbl.ink    IN      A       192.168.40.46"
+local-data: "music.lab.unbl.ink IN      A       192.168.40.46"
+local-data: "emus.lab.unbl.ink	IN	    A	    192.168.40.46"
+local-data: "play.lab.unbl.ink	IN	    A	    192.168.40.46"
+local-data: "rss.lab.unbl.ink   IN      A       192.168.40.46"
+local-data: "dining.see.unbl.ink  IN      A       192.168.40.46"
+local-data: "backyard.see.unbl.ink  IN      A       192.168.40.46"
+local-data: "backyard-low.see.unbl.ink  IN      A       192.168.40.46"
+local-data: "mail.see.unbl.ink  IN      A       192.168.40.46"
+local-data: "ci.lab.unbl.ink              IN    A        192.168.40.46"
+local-data: "podcasts.lab.unbl.ink  	  IN    A        192.168.40.46"
+local-data: "console.s3.unbl.ink   	      IN    A        192.168.40.46"
+local-data: "vrobbler.lab.unbl.ink        IN    A   	 192.168.40.46"
+local-data: "library.lab.unbl.ink         IN	A   	 192.168.40.46"
 local-data: "unbl.ink	       IN   A	   142.93.153.227"