michael.heier/citadel-core
1
0
Fork 1
mirror of https://github.com/runcitadel/core.git synced 2024-12-26 14:44:37 +00:00
Code Issues Projects Releases Wiki Activity

Change subnet

Browse Source
This commit is contained in:
AaronDewes 2022-05-14 07:57:59 +00:00
parent 4a278041cc
commit 12ca6c8de6
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/composegenerator/v1/networking.py
View File

@ -13,7 +13,7 @@ import ipaddress
def assignIp(container: ContainerStage2, appId: str, networkingFile: str, envFile: str) -> ContainerStage2:
ipv6Net = ipaddress.ip_network("fd9e:4a81::/32")
ipv6Net = ipaddress.ip_network("fdc1:7ad3:1234::/48")
# Strip leading/trailing whitespace from container.name
container.name = container.name.strip()
# If the name still contains a newline, throw an error

4
docker-compose.yml
View File

@ -270,8 +270,8 @@ networks:
enable_ipv6: true
ipam:
config:
- subnet: fd9e:4a81::/32
gateway: fd9e:4a81::1
- subnet: $IP6_SUBNET
gateway: $IP6_GATEWAY
volumes:
jwt-public-key: null
jwt-private-key: null

34
scripts/configure vendored
View File

@ -268,22 +268,22 @@ APPS_2_TOR_IP="10.21.21.13"
APPS_3_TOR_IP="10.21.21.14"
REDIS_IP="10.21.21.15"
IP6_SUBNET="fd9e:4a81::/32"
IP6_GATEWAY="fd9e:4a81::1"
NGINX_IP6="fd9e:4a81::2"
DASHBOARD_IP6="fd9e:4a81::3"
MANAGER_IP6="fd9e:4a81::4"
MIDDLEWARE_IP6="fd9e:4a81::5"
NEUTRINO_SWITCHER_IP6="fd9e:4a81::6"
DASHBOARD_NEW_IP6="fd9e:4a81::7"
BITCOIN_IP6="fd9e:4a81::8"
LND_IP6="fd9e:4a81::9"
ELECTRUM_IP6="fd9e:4a81::10"
TOR_PROXY_IP6="fd9e:4a81::11"
APPS_TOR_IP6="fd9e:4a81::12"
APPS_2_TOR_IP6="fd9e:4a81::13"
APPS_3_TOR_IP6="fd9e:4a81::14"
REDIS_IP6="fd9e:4a81::15"
IP6_SUBNET="fdc1:7ad3:1234::/48"
IP6_GATEWAY="fdc1:7ad3:1234::1"
NGINX_IP6="fdc1:7ad3:1234::2"
DASHBOARD_IP6="fdc1:7ad3:1234::3"
MANAGER_IP6="fdc1:7ad3:1234::4"
MIDDLEWARE_IP6="fdc1:7ad3:1234::5"
NEUTRINO_SWITCHER_IP6="fdc1:7ad3:1234::6"
DASHBOARD_NEW_IP6="fdc1:7ad3:1234::7"
BITCOIN_IP6="fdc1:7ad3:1234::8"
LND_IP6="fdc1:7ad3:1234::9"
ELECTRUM_IP6="fdc1:7ad3:1234::10"
TOR_PROXY_IP6="fdc1:7ad3:1234::11"
APPS_TOR_IP6="fdc1:7ad3:1234::12"
APPS_2_TOR_IP6="fdc1:7ad3:1234::13"
APPS_3_TOR_IP6="fdc1:7ad3:1234::14"
REDIS_IP6="fdc1:7ad3:1234::15"
# Ports
BITCOIN_RPC_PORT="8332"
@ -388,7 +388,7 @@ download_docker_compose()
dockerIp6Config = json.dumps({
"ipv6": True,
"fixed-cidr-v6": "fd9e:4a81::/32"
"fixed-cidr-v6": "fdc1:7ad3:1234::/48"
})
print("Updating docker config")