Fix: Corregir indentación YAML en docker-compose
Some checks failed
build-and-deploy / build-and-deploy (push) Failing after 9s
Some checks failed
build-and-deploy / build-and-deploy (push) Failing after 9s
- Servicios al nivel correcto (2 espacios) - Propiedades de servicios con 4 espacios - Items de listas con 6 espacios - Esto soluciona el error: 'Additional property postgres is not allowed'
This commit is contained in:
@@ -8,84 +8,84 @@ services:
|
|||||||
image: ${REG}/${REPO_OWNER}/radiusnucleo:latest
|
image: ${REG}/${REPO_OWNER}/radiusnucleo:latest
|
||||||
container_name: radiusnucleo-node-1
|
container_name: radiusnucleo-node-1
|
||||||
environment:
|
environment:
|
||||||
- VLAN_ID=2
|
- VLAN_ID=2
|
||||||
- MAX_UP=10000000
|
- MAX_UP=10000000
|
||||||
- MAX_DOWN=10000000
|
- MAX_DOWN=10000000
|
||||||
- RADIUS_HOST=freeradius
|
- RADIUS_HOST=freeradius
|
||||||
- RADIUS_AUTH_PORT=1812
|
- RADIUS_AUTH_PORT=1812
|
||||||
- RADIUS_SECRET=${RADIUS_SHARED_SECRET:-tamosbien}
|
- RADIUS_SECRET=${RADIUS_SHARED_SECRET:-tamosbien}
|
||||||
- PGHOST=postgres
|
- PGHOST=postgres
|
||||||
- PGPORT=5432
|
- PGPORT=5432
|
||||||
- PGDATABASE=radius
|
- PGDATABASE=radius
|
||||||
- PGUSER=radius
|
- PGUSER=radius
|
||||||
- PGPASSWORD=radius
|
- PGPASSWORD=radius
|
||||||
networks:
|
networks:
|
||||||
principal:
|
principal:
|
||||||
radiusnucleo_radius_net:
|
radiusnucleo_radius_net:
|
||||||
aliases:
|
aliases:
|
||||||
- node
|
- node
|
||||||
labels:
|
labels:
|
||||||
# Habilitar Traefik
|
# Habilitar Traefik
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.docker.network=principal"
|
- "traefik.docker.network=principal"
|
||||||
|
|
||||||
# Service - Puerto y configuraciones SSE (compartido por ambos routers)
|
# Service - Puerto y configuraciones SSE (compartido por ambos routers)
|
||||||
- "traefik.http.services.wifi-nucleoriofrio-service.loadbalancer.server.port=3000"
|
- "traefik.http.services.wifi-nucleoriofrio-service.loadbalancer.server.port=3000"
|
||||||
- "traefik.http.services.wifi-nucleoriofrio-service.loadbalancer.passhostheader=true"
|
- "traefik.http.services.wifi-nucleoriofrio-service.loadbalancer.passhostheader=true"
|
||||||
- "traefik.http.services.wifi-nucleoriofrio-service.loadbalancer.responseforwarding.flushinterval=1ms"
|
- "traefik.http.services.wifi-nucleoriofrio-service.loadbalancer.responseforwarding.flushinterval=1ms"
|
||||||
- "traefik.http.services.wifi-nucleoriofrio-service.loadbalancer.serverstransport=wifi-transport@file"
|
- "traefik.http.services.wifi-nucleoriofrio-service.loadbalancer.serverstransport=wifi-transport@file"
|
||||||
|
|
||||||
# Router 1: Público (assets, manifest, icons) - SIN autenticación - ALTA PRIORIDAD
|
# Router 1: Público (assets, manifest, icons) - SIN autenticación - ALTA PRIORIDAD
|
||||||
# NOTA: /outpost.goauthentik.io NO debe estar aquí, lo maneja el middleware de Authentik
|
# NOTA: /outpost.goauthentik.io NO debe estar aquí, lo maneja el middleware de Authentik
|
||||||
- "traefik.http.routers.wifi-nucleoriofrio-public.rule=Host(`wifi.nucleoriofrio.com`) && (PathPrefix(`/assets`) || PathPrefix(`/.well-known`) || PathPrefix(`/icons`) || Path(`/manifest.webmanifest`) || Path(`/manifest.json`) || Path(`/favicon.ico`) || Path(`/vite.svg`) || Path(`/sw.js`))"
|
- "traefik.http.routers.wifi-nucleoriofrio-public.rule=Host(`wifi.nucleoriofrio.com`) && (PathPrefix(`/assets`) || PathPrefix(`/.well-known`) || PathPrefix(`/icons`) || Path(`/manifest.webmanifest`) || Path(`/manifest.json`) || Path(`/favicon.ico`) || Path(`/vite.svg`) || Path(`/sw.js`))"
|
||||||
- "traefik.http.routers.wifi-nucleoriofrio-public.entrypoints=websecure"
|
- "traefik.http.routers.wifi-nucleoriofrio-public.entrypoints=websecure"
|
||||||
- "traefik.http.routers.wifi-nucleoriofrio-public.tls.certresolver=letsencrypt"
|
- "traefik.http.routers.wifi-nucleoriofrio-public.tls.certresolver=letsencrypt"
|
||||||
- "traefik.http.routers.wifi-nucleoriofrio-public.service=wifi-nucleoriofrio-service"
|
- "traefik.http.routers.wifi-nucleoriofrio-public.service=wifi-nucleoriofrio-service"
|
||||||
- "traefik.http.routers.wifi-nucleoriofrio-public.priority=100"
|
- "traefik.http.routers.wifi-nucleoriofrio-public.priority=100"
|
||||||
- "traefik.http.routers.wifi-nucleoriofrio-public.middlewares=wifi-headers@docker"
|
- "traefik.http.routers.wifi-nucleoriofrio-public.middlewares=wifi-headers@docker"
|
||||||
|
|
||||||
# Router 2: Principal (todo lo demás) - CON autenticación - BAJA PRIORIDAD
|
# Router 2: Principal (todo lo demás) - CON autenticación - BAJA PRIORIDAD
|
||||||
- "traefik.http.routers.wifi-nucleoriofrio.rule=Host(`wifi.nucleoriofrio.com`)"
|
- "traefik.http.routers.wifi-nucleoriofrio.rule=Host(`wifi.nucleoriofrio.com`)"
|
||||||
- "traefik.http.routers.wifi-nucleoriofrio.entrypoints=websecure"
|
- "traefik.http.routers.wifi-nucleoriofrio.entrypoints=websecure"
|
||||||
- "traefik.http.routers.wifi-nucleoriofrio.tls.certresolver=letsencrypt"
|
- "traefik.http.routers.wifi-nucleoriofrio.tls.certresolver=letsencrypt"
|
||||||
- "traefik.http.routers.wifi-nucleoriofrio.service=wifi-nucleoriofrio-service"
|
- "traefik.http.routers.wifi-nucleoriofrio.service=wifi-nucleoriofrio-service"
|
||||||
- "traefik.http.routers.wifi-nucleoriofrio.priority=10"
|
- "traefik.http.routers.wifi-nucleoriofrio.priority=10"
|
||||||
- "traefik.http.routers.wifi-nucleoriofrio.middlewares=authentik-forward-auth@file,wifi-headers@docker"
|
- "traefik.http.routers.wifi-nucleoriofrio.middlewares=authentik-forward-auth@file,wifi-headers@docker"
|
||||||
|
|
||||||
# Middleware: wifi-headers
|
# Middleware: wifi-headers
|
||||||
- "traefik.http.middlewares.wifi-headers.headers.customrequestheaders.X-Forwarded-Proto=https"
|
- "traefik.http.middlewares.wifi-headers.headers.customrequestheaders.X-Forwarded-Proto=https"
|
||||||
- "traefik.http.middlewares.wifi-headers.headers.customrequestheaders.X-Forwarded-Scheme=https"
|
- "traefik.http.middlewares.wifi-headers.headers.customrequestheaders.X-Forwarded-Scheme=https"
|
||||||
|
|
||||||
freeradius:
|
freeradius:
|
||||||
build: ./freeradius
|
build: ./freeradius
|
||||||
image: ${REG}/${REPO_OWNER}/radiusnucleo-freeradius:latest
|
image: ${REG}/${REPO_OWNER}/radiusnucleo-freeradius:latest
|
||||||
depends_on:
|
depends_on:
|
||||||
- radiusnucleo-node
|
- radiusnucleo-node
|
||||||
- postgres
|
- postgres
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- "1812:1812/udp"
|
- "1812:1812/udp"
|
||||||
- "1813:1813/udp"
|
- "1813:1813/udp"
|
||||||
- "3799:3799/udp"
|
- "3799:3799/udp"
|
||||||
environment:
|
environment:
|
||||||
- RADIUS_CLIENTS_CIDR=${RADIUS_CLIENTS_CIDR:-192.168.87.0/24}
|
- RADIUS_CLIENTS_CIDR=${RADIUS_CLIENTS_CIDR:-192.168.87.0/24}
|
||||||
- RADIUS_SHARED_SECRET=${RADIUS_SHARED_SECRET:-tamosbien}
|
- RADIUS_SHARED_SECRET=${RADIUS_SHARED_SECRET:-tamosbien}
|
||||||
networks:
|
networks:
|
||||||
- radiusnucleo_radius_net
|
- radiusnucleo_radius_net
|
||||||
- principal
|
- principal
|
||||||
|
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:16-alpine
|
image: postgres:16-alpine
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_DB=radius
|
- POSTGRES_DB=radius
|
||||||
- POSTGRES_USER=radius
|
- POSTGRES_USER=radius
|
||||||
- POSTGRES_PASSWORD=radius
|
- POSTGRES_PASSWORD=radius
|
||||||
volumes:
|
volumes:
|
||||||
- postgres_data:/var/lib/postgresql/data
|
- postgres_data:/var/lib/postgresql/data
|
||||||
- ./postgres/init:/docker-entrypoint-initdb.d:ro
|
- ./postgres/init:/docker-entrypoint-initdb.d:ro
|
||||||
networks:
|
networks:
|
||||||
- radiusnucleo_radius_net
|
- radiusnucleo_radius_net
|
||||||
- principal
|
- principal
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
principal:
|
principal:
|
||||||
@@ -94,4 +94,4 @@ networks:
|
|||||||
external: true
|
external: true
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
postgres_data:
|
postgres_data:
|
||||||
|
|||||||
Reference in New Issue
Block a user