diff --git a/apps/rego-tunnel-linux/config.json b/apps/rego-tunnel-linux/config.json index 6cea3ef..3ad87f0 100755 --- a/apps/rego-tunnel-linux/config.json +++ b/apps/rego-tunnel-linux/config.json @@ -22,7 +22,14 @@ "type": "password", "env_variable": "VNC_PASSWORD", "required": true, - "default": "vpnpass" + "default": "Az@83278327$$@@" + }, + { + "label": "APP Port", + "type": "number", + "env_variable": "NOVNC_PORT", + "required": true, + "default": 8806 } ], "supported_architectures": [ diff --git a/apps/rego-tunnel-linux/docker-compose.json b/apps/rego-tunnel-linux/docker-compose.json index dca7df7..76c1719 100755 --- a/apps/rego-tunnel-linux/docker-compose.json +++ b/apps/rego-tunnel-linux/docker-compose.json @@ -1,20 +1,42 @@ { + "schemaVersion": 2, "services": [ { "name": "rego-tunnel-linux", "image": "rego-vpn:latest", - "isMain": true, + "environment": [ + { + "key": "VNC_PASSWORD", + "value": "${VNC_PASSWORD}" + }, + { + "key": "NOVNC_PORT", + "value": "${NOVNC_PORT}" + } + ], "internalPort": 8806, - "privileged": true, - "capAdd": ["NET_ADMIN"], - "devices": ["/dev/net/tun:/dev/net/tun"], - "environment": { - "VNC_PASSWORD": "${VNC_PASSWORD}", - "NOVNC_PORT": "8806" - }, "volumes": [ - { "hostPath": "${APP_DATA_DIR}/data", "containerPath": "/data" } - ] + { + "hostPath": "${APP_DATA_DIR}/data", + "containerPath": "/data", + "readOnly": false, + "shared": false, + "private": false + } + ], + "devices": [ + "/dev/net/tun:/dev/net/tun" + ], + "privileged": true, + "capAdd": [ + "NET_ADMIN" + ], + "isMain": true, + "extraLabels": { + "generated": true, + "runtipi.managed": true, + "runtipi.appurn": "rego-tunnel-linux:runtipi" + } } ] -} +} \ No newline at end of file diff --git a/apps/rego-tunnel-linux/docker-compose.yml b/apps/rego-tunnel-linux/docker-compose.yml index 76a7fd0..68770b4 100755 --- a/apps/rego-tunnel-linux/docker-compose.yml +++ b/apps/rego-tunnel-linux/docker-compose.yml @@ -2,21 +2,47 @@ services: rego-tunnel-linux: image: rego-vpn:latest restart: unless-stopped - privileged: true - devices: - - /dev/net/tun:/dev/net/tun - cap_add: - - NET_ADMIN + networks: + rego-tunnel-linux_runtipi_network: + gw_priority: 0 + tipi_main_network: + gw_priority: 1 environment: VNC_PASSWORD: ${VNC_PASSWORD} - NOVNC_PORT: "8806" + NOVNC_PORT: ${NOVNC_PORT} ports: - - ${APP_PORT}:8806 + - ${NOVNC_PORT}:8806 volumes: - ${APP_DATA_DIR}/data:/data - networks: - - tipi_main_network labels: + generated: true traefik.enable: true - traefik.http.services.rego-tunnel-linux.loadbalancer.server.port: "8806" + traefik.docker.network: runtipi_tipi_main_network + traefik.http.middlewares.rego-tunnel-linux-runtipi-web-redirect.redirectscheme.scheme: https + traefik.http.services.rego-tunnel-linux-runtipi.loadbalancer.server.port: "8806" + traefik.http.routers.rego-tunnel-linux-runtipi-insecure.rule: Host(`${APP_DOMAIN}`) + traefik.http.routers.rego-tunnel-linux-runtipi-insecure.entrypoints: web + traefik.http.routers.rego-tunnel-linux-runtipi-insecure.service: rego-tunnel-linux-runtipi + traefik.http.routers.rego-tunnel-linux-runtipi-insecure.middlewares: rego-tunnel-linux-runtipi-web-redirect + traefik.http.routers.rego-tunnel-linux-runtipi.rule: Host(`${APP_DOMAIN}`) + traefik.http.routers.rego-tunnel-linux-runtipi.entrypoints: websecure + traefik.http.routers.rego-tunnel-linux-runtipi.service: rego-tunnel-linux-runtipi + traefik.http.routers.rego-tunnel-linux-runtipi.tls.certresolver: myresolver runtipi.managed: true + runtipi.appurn: rego-tunnel-linux:runtipi + cap_add: + - NET_ADMIN + devices: + - /dev/net/tun:/dev/net/tun + privileged: true +networks: + tipi_main_network: + name: runtipi_tipi_main_network + external: true + rego-tunnel-linux_runtipi_network: + name: rego-tunnel-linux_runtipi_network + external: false + ipam: + config: + - subnet: 10.128.23.0/24 +