# HG changeset patch
# User Luke Hoersten <luke@hoersten.org>
# Date 1728332737 18000
# Node ID bdbc88cb5078db2fcf3a409f5897a25788e95af2
# Parent  c6c11084c80229d61cc23088f714c83fbf3d2aac
Lots of updates and fixes for Ubuntu 24.04 Noble.

diff -r c6c11084c802 -r bdbc88cb5078 apt-cacher/server/defaults/main.yaml
--- a/apt-cacher/server/defaults/main.yaml	Mon Jul 29 12:41:57 2024 -0500
+++ b/apt-cacher/server/defaults/main.yaml	Mon Oct 07 15:25:37 2024 -0500
@@ -3,3 +3,4 @@
 apt_cacher_cache_dir: "/var/cache/apt-cacher-ng"
 apt_cacher_log_dir: "/var/log/apt-cacher-ng"
 apt_cacher_port: "3142"
+apt_cacher_max_dl_retries: 2
diff -r c6c11084c802 -r bdbc88cb5078 apt-cacher/server/tasks/main.yaml
--- a/apt-cacher/server/tasks/main.yaml	Mon Jul 29 12:41:57 2024 -0500
+++ b/apt-cacher/server/tasks/main.yaml	Mon Oct 07 15:25:37 2024 -0500
@@ -16,6 +16,9 @@
     - { key: "CacheDir", val: "{{apt_cacher_cache_dir}}" }
     - { key: "LogDir", val: "{{apt_cacher_log_dir}}" }
     - { key: "Port", val: "{{apt_cacher_port}}" }
+    - { key: "DlMaxRetries", val: "{{apt_cacher_max_dl_retries}}" }
+    - { key: "DontCacheResolved", val: ".*InRelease" }
+
   notify: restart apt-cacher-ng
 
 - name: make cache and log dirs
diff -r c6c11084c802 -r bdbc88cb5078 aws-s3-backup/tasks/main.yaml
--- a/aws-s3-backup/tasks/main.yaml	Mon Jul 29 12:41:57 2024 -0500
+++ b/aws-s3-backup/tasks/main.yaml	Mon Oct 07 15:25:37 2024 -0500
@@ -1,12 +1,8 @@
 ---
 
-- name: apt install pip
-  become: yes
-  apt: name="python3-pip"
-
 - name: pip install aws cli packages
   become: yes
-  pip: name="{{aws_s3_backup_pip_packages}}"
+  pip: name="{{aws_s3_backup_pip_packages}}" break_system_packages="true"
 
 - name: create aws config dir for root
   become: yes
diff -r c6c11084c802 -r bdbc88cb5078 dendrite/build/defaults/main.yaml
--- a/dendrite/build/defaults/main.yaml	Mon Jul 29 12:41:57 2024 -0500
+++ b/dendrite/build/defaults/main.yaml	Mon Oct 07 15:25:37 2024 -0500
@@ -1,6 +1,6 @@
 ---
 
-dendrite_version: "0.13.7"
+dendrite_version: "0.13.8"
 # https://github.com/matrix-org/dendrite/releases
 dendrite_tar: "https://github.com/matrix-org/dendrite/archive/refs/tags/v{{dendrite_version}}.tar.gz"
 dendrite_build_dir: "/tmp/dendrite-{{dendrite_version}}"
diff -r c6c11084c802 -r bdbc88cb5078 dendrite/server/defaults/main.yaml
--- a/dendrite/server/defaults/main.yaml	Mon Jul 29 12:41:57 2024 -0500
+++ b/dendrite/server/defaults/main.yaml	Mon Oct 07 15:25:37 2024 -0500
@@ -2,7 +2,7 @@
 
 dendrite_user: "dendrite"
 dendrite_old_key: false
-dendrite_registration_disabled: true
+dendrite_registration_disabled: "true"
 dendrite_registration_secret: ""
 
 dendrite_db_user: "dendrite_{{dendrite_instance}}"
@@ -11,7 +11,7 @@
 dendrite_dir: "/var/dendrite"
 dendrite_port: 8008
 
-dendrite_recaptcha_enable: false
+dendrite_recaptcha_enable: "false"
 dendrite_recaptcha_public_key: ""
 dendrite_recaptcha_private_key: ""
 dendrite_recaptcha_bypass_secret: ""
diff -r c6c11084c802 -r bdbc88cb5078 dendrite/server/templates/dendrite.yaml.j2
--- a/dendrite/server/templates/dendrite.yaml.j2	Mon Jul 29 12:41:57 2024 -0500
+++ b/dendrite/server/templates/dendrite.yaml.j2	Mon Oct 07 15:25:37 2024 -0500
@@ -38,7 +38,7 @@
   # you must configure the "database" block for each component instead.
   database:
     connection_string: postgresql://{{dendrite_db_user}}:{{dendrite_db_pass}}@localhost/{{dendrite_db}}?sslmode=disable
-    max_open_conns: 90
+    max_open_conns: 25
     max_idle_conns: 5
     conn_max_lifetime: -1
 
@@ -139,9 +139,9 @@
   # Optional DNS cache. The DNS cache may reduce the load on DNS servers if there
   # is no local caching resolver available for use.
   dns_cache:
-    enabled: false
-    cache_size: 256
-    cache_lifetime: "5m" # 5 minutes; https://pkg.go.dev/time@master#ParseDuration
+    enabled: true
+    cache_size: 4096
+    cache_lifetime: "10m" # 10 minutes; https://pkg.go.dev/time@master#ParseDuration
 
 # Configuration for the Appservice API.
 app_service_api:
diff -r c6c11084c802 -r bdbc88cb5078 dendrite/server/templates/setup_db.psql.j2
--- a/dendrite/server/templates/setup_db.psql.j2	Mon Jul 29 12:41:57 2024 -0500
+++ b/dendrite/server/templates/setup_db.psql.j2	Mon Oct 07 15:25:37 2024 -0500
@@ -1,3 +1,3 @@
 CREATE USER {{dendrite_db_user}};
-ALTER USER {{dendrite_db_user}} WITH PASSWORD '{{dendrite_db_pass}}'
+ALTER USER {{dendrite_db_user}} WITH PASSWORD '{{dendrite_db_pass}}';
 CREATE DATABASE {{dendrite_db}} WITH OWNER {{dendrite_db_user}};
diff -r c6c11084c802 -r bdbc88cb5078 minecraft/server/defaults/main.yaml
--- a/minecraft/server/defaults/main.yaml	Mon Jul 29 12:41:57 2024 -0500
+++ b/minecraft/server/defaults/main.yaml	Mon Oct 07 15:25:37 2024 -0500
@@ -14,8 +14,8 @@
 
 # https://papermc.io/downloads/paper
 # paper is a spigot derivative
-minecraft_paper_version: "1.20.6"
-minecraft_paper_build: "148"
+minecraft_paper_version: "1.21.1"
+minecraft_paper_build: "115"
 
 minecreat_plugins_enabled:
   - "dynmap"
@@ -23,7 +23,7 @@
 
 # https://www.reddit.com/r/Dynmap/
 # http://dynmap.us/builds/dynmap/?C=M;O=D
-minecraft_dynmap_version: "3.7-beta-6"
+minecraft_dynmap_version: "3.7-beta-7"
 minecraft_dynmap_url: "http://dynmap.us/builds/dynmap/Dynmap-{{minecraft_dynmap_version}}-spigot.jar"
 
 # https://geysermc.org
diff -r c6c11084c802 -r bdbc88cb5078 miniflux/defaults/main.yaml
--- a/miniflux/defaults/main.yaml	Mon Jul 29 12:41:57 2024 -0500
+++ b/miniflux/defaults/main.yaml	Mon Oct 07 15:25:37 2024 -0500
@@ -4,5 +4,5 @@
 miniflux_admin_pass: "admin"
 miniflux_arch: "arm64"
 # https://github.com/miniflux/miniflux/releases
-miniflux_version: "2.1.4"
+miniflux_version: "2.2.1"
 miniflux_url: "https://github.com/miniflux/miniflux/releases/download/{{miniflux_version}}/miniflux-linux-{{miniflux_arch}}"
diff -r c6c11084c802 -r bdbc88cb5078 nginx/tasks/main.yaml
--- a/nginx/tasks/main.yaml	Mon Jul 29 12:41:57 2024 -0500
+++ b/nginx/tasks/main.yaml	Mon Oct 07 15:25:37 2024 -0500
@@ -2,7 +2,10 @@
 
 - name: apt install nginx
   become: yes
-  apt: name="nginx"
+  apt: name="{{item}}"
+  loop:
+    - "nginx"
+    - "libnginx-mod-stream"
   notify: restart nginx
 
 - name: disable default site
diff -r c6c11084c802 -r bdbc88cb5078 nostr/build/defaults/main.yaml
--- a/nostr/build/defaults/main.yaml	Mon Jul 29 12:41:57 2024 -0500
+++ b/nostr/build/defaults/main.yaml	Mon Oct 07 15:25:37 2024 -0500
@@ -1,6 +1,6 @@
 ---
 
-relayer_version: "2.1.13"
+relayer_version: "2.1.17"
 # https://github.com/fiatjaf/relayer/releases
 relayer_tar: "https://github.com/fiatjaf/relayer/archive/refs/tags/v{{relayer_version}}.tar.gz"
 relayer_build_dir: "/tmp/relayer-{{relayer_version}}"
diff -r c6c11084c802 -r bdbc88cb5078 octoprint/tasks/main.yaml
--- a/octoprint/tasks/main.yaml	Mon Jul 29 12:41:57 2024 -0500
+++ b/octoprint/tasks/main.yaml	Mon Oct 07 15:25:37 2024 -0500
@@ -6,7 +6,7 @@
 
 - name: pip install octoprint
   become: yes
-  pip: name="octoprint" executable="pip3"
+  pip: name="octoprint" executable="pip3" break_system_packages="true"
   notify: restart octoprint
 
 - name: install octoprint systemd service
diff -r c6c11084c802 -r bdbc88cb5078 pleroma/otp/defaults/main.yaml
--- a/pleroma/otp/defaults/main.yaml	Mon Jul 29 12:41:57 2024 -0500
+++ b/pleroma/otp/defaults/main.yaml	Mon Oct 07 15:25:37 2024 -0500
@@ -2,6 +2,7 @@
 
 pleroma_host: "localhost"
 pleroma_port: 4000
+pleroma_metrics_port: 4020
 pleroma_scheme: "http"
 
 pleroma_proxy_pass: "{{pleroma_scheme}}://{{pleroma_host}}:{{pleroma_port}}"
diff -r c6c11084c802 -r bdbc88cb5078 pleroma/otp/tasks/main.yaml
--- a/pleroma/otp/tasks/main.yaml	Mon Jul 29 12:41:57 2024 -0500
+++ b/pleroma/otp/tasks/main.yaml	Mon Oct 07 15:25:37 2024 -0500
@@ -9,11 +9,8 @@
   apt: name="{{item}}"
   loop:
     - "libmagic-dev"
-    - "libtinfo5"
-
-- name: install libssl1.1 deb
-  become: yes
-  apt: deb="http://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_{{arch}}.deb"
+    - "libtinfo6"
+    - "libvips42t64"
 
 - name: create pleroma config and data directories
   become: yes
diff -r c6c11084c802 -r bdbc88cb5078 pleroma/otp/templates/config.exs.j2
--- a/pleroma/otp/templates/config.exs.j2	Mon Jul 29 12:41:57 2024 -0500
+++ b/pleroma/otp/templates/config.exs.j2	Mon Oct 07 15:25:37 2024 -0500
@@ -40,11 +40,20 @@
   pool_size: 10,
   timeout: 60000
 
-config :prometheus, Pleroma.Web.Endpoint.MetricsExporter,
-  enabled: true
-#   ip_whitelist: ["127.0.0.1"],
-#   path: "/api/pleroma/app_metrics",
-#   format: :text
+config :pleroma, Pleroma.PromEx,
+  disabled: false,
+  manual_metrics_start_delay: :no_delay,
+  drop_metrics_groups: [],
+  grafana: [],
+  metrics_server: [
+    port: {{pleroma_metrics_port}},
+    path: "/metrics",
+    protocol: :http,
+    pool_size: 5,
+    cowboy_opts: [],
+    auth_strategy: :none
+  ],
+  datasource: "Prometheus"
 
 config :logger,
   backends: [{ExSyslogger, :ex_syslogger}]
diff -r c6c11084c802 -r bdbc88cb5078 postgresql/defaults/main.yaml
--- a/postgresql/defaults/main.yaml	Mon Jul 29 12:41:57 2024 -0500
+++ b/postgresql/defaults/main.yaml	Mon Oct 07 15:25:37 2024 -0500
@@ -1,7 +1,7 @@
 ---
 
 # migrate PG version with pg_upgradecluster (see manpage)
-postgresql_version: "14"
+postgresql_version: "16"
 postgresql_initidb_path: "/usr/lib/postgresql/{{postgresql_version}}/bin/initdb"
 postgresql_config_path: "/etc/postgresql/{{postgresql_version}}/main/postgresql.conf"
 postgresql_data_dir: "/var/lib/postgresql/{{postgresql_version}}/main"