fix(cistech-tunnel): correct routing config and sync compose files
Some checks failed
Test / test (push) Has been cancelled
Some checks failed
Test / test (push) Has been cancelled
- host-routing.sh: Updated to use cistech values (172.30.0.10, br-vpn-static) - config.json: Added TARGET_IP form field, bumped tipi_version to 2 - docker-compose.json: Added TARGET_IP environment variable - docker-compose.yml: Synced with docker-compose.json (correct image, port 6080, all env vars) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
services:
|
||||
cistech-tunnel:
|
||||
image: cistech-vpn:latest
|
||||
image: git.alexzaw.dev/alexz/cistech-vpn:latest
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
cistech-tunnel_runtipi_network:
|
||||
@@ -9,20 +9,33 @@ services:
|
||||
gw_priority: 1
|
||||
environment:
|
||||
OC_URL: ${OC_URL}
|
||||
OC_SERVERCERT: ${OC_SERVERCERT}
|
||||
OC_USER: ${OC_USER}
|
||||
OC_PASSWORD: ${OC_PASSWORD}
|
||||
OC_TOTP_SECRET: ${OC_TOTP_SECRET}
|
||||
VNC_PASSWORD: ${VNC_PASSWORD}
|
||||
NOVNC_PORT: "6902"
|
||||
NOVNC_PORT: "6080"
|
||||
TZ: ${TZ}
|
||||
TARGET_IP: ${TARGET_IP}
|
||||
ports:
|
||||
- ${APP_PORT}:6902
|
||||
- ${APP_PORT}:6080
|
||||
volumes:
|
||||
- ${APP_DATA_DIR}/data:/root
|
||||
- ${APP_DATA_DIR}/config:/config
|
||||
- ${APP_DATA_DIR}:/runtime
|
||||
- /etc/runtipi/repos/runtipi/apps/cistech-tunnel/shared:/shared
|
||||
- /sys/fs/cgroup:/sys/fs/cgroup
|
||||
- /etc/runtipi/repos/runtipi/apps/cistech-tunnel/shared/xstartup:/root/.vnc/xstartup:ro
|
||||
devices:
|
||||
- /dev/net/tun
|
||||
privileged: true
|
||||
cap_add:
|
||||
- NET_ADMIN
|
||||
stop_grace_period: 30s
|
||||
labels:
|
||||
generated: true
|
||||
traefik.enable: true
|
||||
traefik.docker.network: runtipi_tipi_main_network
|
||||
traefik.http.middlewares.cistech-tunnel-runtipi-web-redirect.redirectscheme.scheme: https
|
||||
traefik.http.services.cistech-tunnel-runtipi.loadbalancer.server.port: "6902"
|
||||
traefik.http.services.cistech-tunnel-runtipi.loadbalancer.server.port: "6080"
|
||||
traefik.http.routers.cistech-tunnel-runtipi-insecure.rule: Host(`${APP_DOMAIN}`)
|
||||
traefik.http.routers.cistech-tunnel-runtipi-insecure.entrypoints: web
|
||||
traefik.http.routers.cistech-tunnel-runtipi-insecure.service: cistech-tunnel-runtipi
|
||||
@@ -31,4 +44,4 @@ services:
|
||||
traefik.http.routers.cistech-tunnel-runtipi.entrypoints: websecure
|
||||
traefik.http.routers.cistech-tunnel-runtipi.service: cistech-tunnel-runtipi
|
||||
traefik.http.routers.cistech-tunnel-runtipi.tls.certresolver: myresolver
|
||||
runtipi.managed: true
|
||||
runtipi.managed: true
|
||||
|
||||
Reference in New Issue
Block a user