diff --git a/compose.yml b/compose.yml index 7c85cdc..ac0dffe 100644 --- a/compose.yml +++ b/compose.yml @@ -6,6 +6,10 @@ networks: external: true name: ${NETWORK:-web} +# secrets: +# basic_auth_credentials: +# file: ./secrets/basic_auth_credentials + include: - compose/base.yml - compose/services.yml diff --git a/compose/base.yml b/compose/base.yml index 8dde228..1cd4ee6 100644 --- a/compose/base.yml +++ b/compose/base.yml @@ -1,5 +1,5 @@ x-environment: &default-environment - LOG_LEVEL: "ERROR" + LOG_LEVEL: "INFO" ACME_PATH: "./acme.json" NETWORK: "${NETWORK:-web}" DOMAINNAME: "${DOMAINNAME:-furyhawk.lol}" @@ -20,7 +20,6 @@ services: portainer: image: portainer/portainer-ce:sts command: -H unix:///var/run/docker.sock - container_name: portainer security_opt: - no-new-privileges:true environment: @@ -38,7 +37,7 @@ services: - "traefik.enable=true" - "traefik.http.routers.portainer.entrypoints=web-secure" - "traefik.http.routers.portainer.rule=Host(`portainer.${DOMAINNAME}`)||Host(`port.${DOMAINNAME}`)" - - "traefik.http.router.portainer.middlewares=csrf" + - "traefik.http.router.portainer.middlewares=csrf@file" - "traefik.http.routers.portainer.tls.certresolver=letsencrypt" - "traefik.http.router.portainer.service=portainer_service" - "traefik.http.services.portainer_service.loadbalancer.server.port=9000" @@ -50,7 +49,6 @@ services: context: . dockerfile: ./traefik/Dockerfile image: traefik_production - container_name: traefik security_opt: - no-new-privileges:true restart: always diff --git a/compose/traefik/traefik.yml b/compose/traefik/traefik.yml index 81aab6c..3971c8c 100644 --- a/compose/traefik/traefik.yml +++ b/compose/traefik/traefik.yml @@ -1,5 +1,5 @@ log: - level: DEBUG + level: INFO accessLog: {} api: # Dashboard @@ -90,37 +90,8 @@ tcp: # - address: "emqx2:8084" http: + routers: - # dashboard: - # entryPoints: - # - web-secure - # rule: "Host(`dashboard.furyhawk.lol`)" - # middlewares: - # - auth - # tls: - # # https://docs.traefik.io/master/routing/routers/#certresolver - # certResolver: letsencrypt - # service: api@internal - - portainer-router: - entryPoints: - - web-secure - rule: "Host(`portainer.furyhawk.lol`) || Host(`port.furyhawk.lol`)" - middlewares: - - csrf - tls: - certResolver: letsencrypt - service: portainer_service - - edge-router: - entryPoints: - - web-secure - rule: "Host(`edge.furyhawk.lol`)" - middlewares: - - csrf - tls: - certResolver: letsencrypt - service: edge_service adminer-router: entryPoints: @@ -504,14 +475,7 @@ http: server: "" # hide server info from visitors services: - portainer_service: - loadBalancer: - servers: - - url: http://portainer:9000 - edge_service: - loadBalancer: - servers: - - url: http://portainer:8000 + osrm_service: loadBalancer: servers: