diff --git a/.gitignore b/.gitignore index 2e43810..8554309 100644 --- a/.gitignore +++ b/.gitignore @@ -12,9 +12,6 @@ _traefik/shared tmp.* *.tmp *.off -# Exclude specific local configurations -**/config.json - _secrets/* !_secrets/README.md diff --git a/_traefik/dynamic/_templates/rt.kateryna-0.yml.sz b/_traefik/dynamic/_templates/rt.kateryna-0.yml.sz deleted file mode 100644 index d888898..0000000 --- a/_traefik/dynamic/_templates/rt.kateryna-0.yml.sz +++ /dev/null @@ -1,31 +0,0 @@ -# http routing section -http: - routers: - kateryna-szk: - rule: "Host(`kateryna.szk.li`) && PathPrefix(`/`)" - entrypoints: - - websecure - service: kateryna - tls: - certresolver: myresolver - kateryna-lksz: - rule: "Host(`kateryna.lksz.me`) && PathPrefix(`/`)" - entrypoints: - - websecure - service: kateryna - tls: - certresolver: myresolver - kateryna-k-lksz: - rule: "Host(`k.lksz.me`) && PathPrefix(`/`)" - entrypoints: - - websecure - service: kateryna - tls: - certresolver: myresolver - - services: - # Define how to reach an existing service on our infrastructure - kateryna: - loadBalancer: - servers: - - url: http://192.168.222.1:11080 diff --git a/dockge/docker-compose.yml b/dockge/docker-compose.yml new file mode 100644 index 0000000..29831af --- /dev/null +++ b/dockge/docker-compose.yml @@ -0,0 +1,32 @@ +services: + dockge: + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /srv/dockge/stacks:/srv/dockge/stacks + environment: + DOCKGE_STACKS_DIR: /srv/dockge/stacks + + # RUNTIPI Environment + RUNTIPI_APP_PORT: "${APP_PORT}" + RUNTIPI_APP_ID: "${APP_ID}" + RUNTIPI_APP_DATA_DIR: "${APP_DATA_DIR}" + RUNTIPI_APP_EXPOSED: "${APP_EXPOSED:-}" + RUNTIPI_APP_DOMAIN: "${APP_DOMAIN}" + RUNTIPI_APP_HOST: "${APP_HOST}" + RUNTIPI_LOCAL_DOMAIN: "${LOCAL_DOMAIN}" + RUNTIPI_DOMAIN: "${DOMAIN}" + RUNTIPI_ROOT_DOMAIN: "${ROOT_DOMAIN}" + HOST_UID: "${HOST_UID}" + HOST_GID: "${HOST_GID}" + PUID: "${HOST_UID}" + PGID: "${HOST_GID}" + TZ: "${TZ:?Did you forget to define TZ in the root RunTipi .env.local?}" + labels: + traefik.http.routers.dockge.rule: Host(`dockge.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-} + traefik.http.routers.dockge.middlewares: authentik_sysmgr@file + + # traefik.enable: true + # # traefik.http.services.dockge.loadbalancer.server.port: 5001 + # traefik.http.routers.dockge.entrypoints: websecure + # traefik.http.routers.dockge.service: dockge + # traefik.http.routers.dockge.tls.certresolver: myresolver diff --git a/vaultwarden/app.env.local b/vaultwarden/app.env.local index def658c..4e04219 100644 --- a/vaultwarden/app.env.local +++ b/vaultwarden/app.env.local @@ -1,4 +1,4 @@ -# VARIABLE=value #comment -APP_ROUTE_OPTIONAL=${ALT_ROOT_DOMAIN:+ || Host(`vault.${ALT_ROOT_DOMAIN}`)} +# VARIABLE=value #comment# VARIABLE=value #comment +#APP_ROUTE_OPTIONAL=" || Host(`vault.lksz.me`)" VAULTWARDEN_POSTGRES_PASSWORD="Create a new DB Password here" VAULTWARDEN_ADMIN_PASSWORD="User argon2 hash" diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml index e9ab9fa..b1f4e2b 100644 --- a/vaultwarden/docker-compose.yml +++ b/vaultwarden/docker-compose.yml @@ -18,7 +18,7 @@ services: labels: # Websecure traefik.http.routers.vaultwarden.rule: Host(`vault.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-} - traefik.docker.network: runtipi_tipi_main_network + traefik.docker.network: tipi_main_network #runtipi_tipi_main_network networks: vaultwarden-pg: external: true