chore(deps): update mariadb docker tag to v13

.env.sample

@@ -107,6 +107,3 @@ DEFAULT_QUOTA="10 GB"
 #HSTS_ENABLED=1
 # Uncomment this line to add the `preload` part
 #HSTS_PRELOAD=1
-
-# Metrics
-# COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml"

README.md

@@ -129,21 +129,6 @@ To disable dashboard app (since it is so corporate):
 
 - Configure a `defaultapp` in your `config.php` or use [apporder](https://apps.nextcloud.com/apps/apporder)
 
-## Metrics
-
-Since Version 33, Nextcloud offers a /metrics endpoint (see [here](https://docs.nextcloud.com/server/stable/admin_manual/configuration_monitoring/index.html)).
-Its configured via alloys label-based auto-discovery provided by the updated
-[monitoring-stack](https://git.coopcloud.tech/coop-cloud/monitoring-ng). 
-
-To enable, uncomment 
-```
-COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml"
-```
-and run `configure_metrics`:
-```
-abra app cmd <domain> app configure_metrics
-```
-
 ## Upgrading Nextcloud
 
 Upgrading Nextcloud can be a hair raising experiance. They

abra.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export FPM_TUNE_VERSION=v5
-export NGINX_CONF_VERSION=v9
+export NGINX_CONF_VERSION=v8
 export MY_CNF_VERSION=v6
 export ENTRYPOINT_VERSION=v3
 export ENTRYPOINT_WHITEBOARD_VERSION=v1
@@ -195,10 +195,6 @@ upgrade_mariadb() {
     mariadb-upgrade -p`cat /run/secrets/db_root_password`
 }
 
-configure_metrics() {
-    run_occ "config:system:set openmetrics_allowed_clients 0 --value='10.0.0.0/8'"
-}
-
 # Checks whether this instance looks ready to update to the next Nextcloud
 # major version.
 #

compose.mariadb.yml

@@ -9,7 +9,7 @@ services:
       - MYSQL_PASSWORD_FILE=/run/secrets/db_password
 
   db:
-    image: "mariadb:12.3"
+    image: "mariadb:13.0"
     environment:
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud

compose.metrics.yml

@@ -1,10 +0,0 @@
-version: "3.8"
-services:
-  web:
-    environment:
-      - METRICS_ENABLED=true
-    deploy:
-      labels:
-        - "prometheus.io/scrape=true"
-        - "prometheus.io/port=9205"
-        - "prometheus.io/path=/metrics"

nginx.conf.tmpl

@@ -185,23 +185,4 @@ http {
             try_files $uri $uri/ /index.php$request_uri;
         }
     }
-
-    {{ if env "METRICS_ENABLED" }}
-    server {
-        listen 9205;
-
-        location = /metrics {
-            include fastcgi_params;
-            fastcgi_param SCRIPT_FILENAME /var/www/html/index.php;
-            fastcgi_param SCRIPT_NAME /index.php;
-            fastcgi_param REQUEST_URI /metrics;
-            fastcgi_param HTTP_HOST {{ env "DOMAIN" }};
-            fastcgi_pass php-handler;
-        }
-
-        location / {
-            return 404;
-        }
-    }
-    {{ end }}
 }

release/next

@@ -1 +0,0 @@
-add option to scrape native /metrics endpoint via alloys auto-discovery