From de268c96d916b0df35c559720fb66a87fbf85559 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 25 Nov 2024 20:12:17 +0100 Subject: [PATCH] authelia: remove registry-ui (#254) Signed-off-by: Michael Grote Reviewed-on: https://git.mgrote.net/mg/homeserver/pulls/254 Co-authored-by: Michael Grote Co-committed-by: Michael Grote --- docker-compose/authelia/configuration.yml.j2 | 4 ---- docker-compose/registry/docker-compose.yml.j2 | 11 ++--------- group_vars/blocky.yml | 4 ---- group_vars/munin.yml | 2 +- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/docker-compose/authelia/configuration.yml.j2 b/docker-compose/authelia/configuration.yml.j2 index 526b9e24..f98d3bf0 100644 --- a/docker-compose/authelia/configuration.yml.j2 +++ b/docker-compose/authelia/configuration.yml.j2 @@ -21,10 +21,6 @@ access_control: policy: one_factor subject: - 'group:authelia_wiki' - - domain: rui.mgrote.net - policy: one_factor - subject: - - 'group:authelia_registry-ui' session: name: authelia_session diff --git a/docker-compose/registry/docker-compose.yml.j2 b/docker-compose/registry/docker-compose.yml.j2 index 61771d8d..eb8366c0 100644 --- a/docker-compose/registry/docker-compose.yml.j2 +++ b/docker-compose/registry/docker-compose.yml.j2 @@ -66,9 +66,10 @@ services: oci-registry-ui: restart: unless-stopped pull_policy: missing - # url: registry.mgrote.net/ui/index.html image: "joxit/docker-registry-ui:2.5.7" container_name: oci-registry-ui + ports: + - 5511:80 environment: DELETE_IMAGES: true SINGLE_REGISTRY: true @@ -86,14 +87,6 @@ services: interval: 30s timeout: 10s retries: 3 - labels: - traefik.http.routers.registry-ui.rule: Host(`rui.mgrote.net`) - traefik.http.routers.registry-ui.middlewares: allowlist_localnet@file,ratelimit40@file,authelia@docker - traefik.enable: true - traefik.http.routers.registry-ui.tls: true - traefik.http.routers.registry-ui.tls.certresolver: resolver_letsencrypt - traefik.http.routers.registry-ui.entrypoints: entry_https - traefik.http.services.registry-ui.loadbalancer.server.port: 80 ######## Networks ######## networks: diff --git a/group_vars/blocky.yml b/group_vars/blocky.yml index a9ec5915..876f51db 100644 --- a/group_vars/blocky.yml +++ b/group_vars/blocky.yml @@ -88,10 +88,6 @@ blocky_custom_lookups: # optional ip: 192.168.2.43 - name: munin.mgrote.net ip: 192.168.2.40 - - name: s3.mgrote.net - ip: 192.168.2.43 - - name: rui.mgrote.net - ip: 192.168.2.43 ### mgrote_munin_node # kann git.mgrote.net nicht auflösen, deshalb hiermit IP diff --git a/group_vars/munin.yml b/group_vars/munin.yml index c4cfe98f..927eefcc 100644 --- a/group_vars/munin.yml +++ b/group_vars/munin.yml @@ -101,7 +101,7 @@ munin_node_plugins: src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/http/http_response config: | [http_response] - env.sites https://git.mgrote.net https://docker10.mgrote.net:8443 https://rui.mgrote.net/ http://munin.mgrote.net http://192.168.5.1 http://192.168.3.1 http://192.168.3.108:8080 http://192.168.3.204 http://docker10.mgrote.net:6483 https://miniflux.mgrote.net/ https://nextcloud.mgrote.net https://audio.mgrote.net/mg http://wiki.mgrote.net https://s3.mgrote.net https://auth.mgrote.net http://docker10.mgrote.net:17170 + env.sites https://git.mgrote.net https://docker10.mgrote.net:8443 http://munin.mgrote.net http://192.168.5.1 http://192.168.3.1 http://192.168.3.108:8080 http://192.168.3.204 http://docker10.mgrote.net:6483 https://miniflux.mgrote.net/ https://nextcloud.mgrote.net https://audio.mgrote.net/mg http://wiki.mgrote.net https://auth.mgrote.net http://docker10.mgrote.net:17170 env.max_time 20 env.short_label true env.follow_redirect true