From 27739609362360b2bf533f5a59106ce52c8d4b9f Mon Sep 17 00:00:00 2001
From: Luke Hoersten <luke@hoersten.org>
Date: Mon, 7 Oct 2024 15:25:37 -0500
Subject: Lots of updates and fixes for Ubuntu 24.04 Noble.

---
 pleroma/otp/defaults/main.yaml      |  1 +
 pleroma/otp/tasks/main.yaml         |  7 ++-----
 pleroma/otp/templates/config.exs.j2 | 19 ++++++++++++++-----
 3 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'pleroma/otp')

diff --git a/pleroma/otp/defaults/main.yaml b/pleroma/otp/defaults/main.yaml
index bb92280..86dac13 100644
--- a/pleroma/otp/defaults/main.yaml
+++ b/pleroma/otp/defaults/main.yaml
@@ -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 --git a/pleroma/otp/tasks/main.yaml b/pleroma/otp/tasks/main.yaml
index de6b8ed..1052644 100644
--- a/pleroma/otp/tasks/main.yaml
+++ b/pleroma/otp/tasks/main.yaml
@@ -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 --git a/pleroma/otp/templates/config.exs.j2 b/pleroma/otp/templates/config.exs.j2
index c707181..283b46c 100644
--- a/pleroma/otp/templates/config.exs.j2
+++ b/pleroma/otp/templates/config.exs.j2
@@ -40,11 +40,20 @@ config :pleroma, Pleroma.Repo,
   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}]
-- 
cgit v1.2.3