containers/moneyapp/moneyapp.svg

@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-  <circle cx="256" cy="256" r="256" fill="#2e9e6b"/>
-  <rect x="116" y="176" width="280" height="160" rx="20" fill="#ffffff"/>
-  <circle cx="256" cy="256" r="42" fill="none" stroke="#2e9e6b" stroke-width="16"/>
-  <circle cx="168" cy="256" r="11" fill="#2e9e6b"/>
-  <circle cx="344" cy="256" r="11" fill="#2e9e6b"/>
-</svg>

containers/onlyoffice/scripts/onlyoffice_traefik.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# OnlyOffice traefik middleware hooks (consumed by traefikSetupLabelsMiddlewares
-# and tagsProcessorPortMiddlewares). It serves the document editor with its own
-# header requirements, so it opts out of the default chain and adds its own
-# headers middleware.
-
-# Marker — presence means: don't attach default@file to this app's routers.
-appTraefikSkipsDefaultMiddleware_onlyoffice() { :; }
-
-# Extra middleware entries appended for this app.
-appTraefikExtraMiddlewares_onlyoffice() { echo "onlyoffice-headers"; }

containers/owncloud/scripts/owncloud_traefik.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# ownCloud traefik middleware hook. It does its own routing, so it opts out of
-# the default middleware chain (no app-specific extras).
-
-# Marker — presence means: don't attach default@file to this app's routers.
-appTraefikSkipsDefaultMiddleware_owncloud() { :; }

scripts/network/traefik/traefik_middlewares.sh

@@ -5,19 +5,16 @@ traefikSetupLabelsMiddlewares()
     local app_name="$1"
     local middleware_entries=()
 
-    # Default chain unless the app opts out via its per-app hook
+    # List of app names to exclude from default middleware
-    # (containers/<app>/scripts/<app>_traefik.sh defines
+    local exclude_apps=("onlyoffice" "owncloud")
-    # appTraefikSkipsDefaultMiddleware_<app>).
+    # Check if app_name is not in the list of excluded apps
-    if ! declare -F "appTraefikSkipsDefaultMiddleware_${app_name}" >/dev/null 2>&1; then
+    if [[ ! " ${exclude_apps[@]} " =~ " $app_name " ]]; then
         middleware_entries+=("default@file")
     fi
 
-    # App-specific extras (e.g. onlyoffice-headers) via the per-app hook.
+    # App Specific middlewears
-    if declare -F "appTraefikExtraMiddlewares_${app_name}" >/dev/null 2>&1; then
+    if [[ "$app_name" == "onlyoffice" ]]; then
-        local _mw
+        middleware_entries+=("onlyoffice-headers")
-        while IFS= read -r _mw; do
-            [[ -n "$_mw" ]] && middleware_entries+=("$_mw")
-        done < <("appTraefikExtraMiddlewares_${app_name}")
     fi
 
     if [[ "$authelia_setup" == "true" && "$whitelist" == "true" ]]; then

scripts/network/traefik/traefik_port_middlewares.sh

@@ -26,12 +26,14 @@ tagsProcessorPortMiddlewares()
         return 0
     fi
 
-    # Apps opt out of the default middleware chain via a per-app hook
+    # Excluded apps that historically opted out of the default middleware
-    # (containers/<app>/scripts/<app>_traefik.sh defines
+    # chain — keeps existing behavior for onlyoffice / owncloud which do
-    # appTraefikSkipsDefaultMiddleware_<app>) — e.g. onlyoffice / owncloud, which
+    # their own routing.
-    # do their own routing.
+    local exclude_apps=("onlyoffice" "owncloud")
     local include_default="true"
-    declare -F "appTraefikSkipsDefaultMiddleware_${app_name}" >/dev/null 2>&1 && include_default="false"
+    if [[ " ${exclude_apps[@]} " =~ " $app_name " ]]; then
+        include_default="false"
+    fi
 
     local count=${#port_service_names[@]}
     local i=0
@@ -65,12 +67,9 @@ tagsProcessorPortMiddlewares()
                 mw+=("crowdsec-bouncer@file")
             fi
 
-            # App-specific extras (e.g. onlyoffice-headers) via the per-app hook.
+            # onlyoffice / mastodon / similar app-specific middlewares
-            if declare -F "appTraefikExtraMiddlewares_${app_name}" >/dev/null 2>&1; then
+            if [[ "$app_name" == "onlyoffice" ]]; then
-                local _mw
+                mw+=("onlyoffice-headers")
-                while IFS= read -r _mw; do
-                    [[ -n "$_mw" ]] && mw+=("$_mw")
-                done < <("appTraefikExtraMiddlewares_${app_name}")
             fi
 
             local joined; joined=$(IFS=,; echo "${mw[*]}")