From 09f4a3edf04d3b669b682b6686aab991de8f018c Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <elberfeld@web.de>
Date: Sun, 26 Feb 2023 15:44:16 +0100
Subject: [PATCH] omada ports in site.yml definieren
---
intern/docker_omada/templates/docker-compose.yml | 16 ++++++++--------
site.yml | 5 ++++-
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/intern/docker_omada/templates/docker-compose.yml b/intern/docker_omada/templates/docker-compose.yml
index 9b0923a5..9ad6bf70 100644
--- a/intern/docker_omada/templates/docker-compose.yml
+++ b/intern/docker_omada/templates/docker-compose.yml
@@ -8,9 +8,9 @@ services:
image: mbentley/omada-controller:5.7
restart: always
ports:
- - 8088:8088
- - 8043:8043
- - 8843:8843
+ - {{ omada_port_http }}:8088
+ - {{ omada_port_https }}:8043
+ - {{ omada_portal_https }}:8843
- 27001:27001/udp
- 29810:29810/udp
- 29811:29811
@@ -28,10 +28,10 @@ services:
TZ: Europe/Berlin
PUID: 508
PGID: 508
- MANAGE_HTTP_PORT: 8088
- MANAGE_HTTPS_PORT: 8043
- PORTAL_HTTP_PORT: 8088
- PORTAL_HTTPS_PORT: 8843
+ MANAGE_HTTP_PORT: {{ omada_port_http }}
+ MANAGE_HTTPS_PORT: {{ omada_port_https }}
+ PORTAL_HTTP_PORT: {{ omada_port_http }}
+ PORTAL_HTTPS_PORT: {{ omada_portal_https }}
PORT_ADOPT_V1: 29812
PORT_APP_DISCOVERY: 27001
PORT_DISCOVERY: 29810
@@ -48,7 +48,7 @@ services:
- traefik.http.routers.{{ servicename }}.entrypoints=websecure
- "traefik.http.routers.{{ servicename }}.middlewares={{ servicename }}-redirect"
- "traefik.http.middlewares.{{ servicename }}-redirect.redirectregex.regex=(.)*"
- - "traefik.http.middlewares.{{ servicename }}-redirect.redirectregex.replacement=https://{{ domain }}:8043"
+ - "traefik.http.middlewares.{{ servicename }}-redirect.redirectregex.replacement=https://{{ domain }}:{{ omada_port_https }}"
networks:
- default
- web
diff --git a/site.yml b/site.yml
index c49a94b8..423e6e88 100644
--- a/site.yml
+++ b/site.yml
@@ -108,7 +108,10 @@
basedir: /srv/omada,
domain: "omada.warpzone.lan",
certFile: "/srv/traefik/warpzone+internal+services.pem",
- keyFile: "/srv/traefik/warpzone+internal+services.key"
+ keyFile: "/srv/traefik/warpzone+internal+services.key",
+ omada_port_http: 8088,
+ omada_port_https: 8043,
+ omada_portal_https: 8843
}
- {
role: intern/docker_graylog, tags: graylog,
--
GitLab