From 075064a888c450c5b5a5c05c595ad7b0a17bc838 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 10 Jul 2021 00:51:01 +0100 Subject: [PATCH] Revert "Default IPv6 by environment variable" This reverts commit fb1032e116ae2739d81acbd80aeb6c0a1feb0316. --- config.py | 5 ----- docker-configs/docker-compose-ipv6.yml | 1 - 2 files changed, 6 deletions(-) diff --git a/config.py b/config.py index 452cb7f..1a6d2c7 100755 --- a/config.py +++ b/config.py @@ -33,7 +33,6 @@ import const import socket import ipaddress from socket import gethostbyname -import os # Does anybody read this stuff? There's a PEP somewhere that says I should do this. @@ -331,10 +330,6 @@ def build_config(_config_file): 'ENHANCED_OBP': config.getboolean(section, 'ENHANCED_OBP') }}) - #If IPv6 is enabled by enviornment variable... - if CONFIG['SYSTEMS'][section]['IP'] == '' and 'FD_DEFAULT_IPV6' in os.environ and bool(os.environ['FD_DEFAULT_IPV6']): - CONFIG['SYSTEMS'][section]['IP'] = '::' - try: if CONFIG['SYSTEMS'][section]['IP'] == '::': diff --git a/docker-configs/docker-compose-ipv6.yml b/docker-configs/docker-compose-ipv6.yml index 5fa94b3..60bdd8d 100644 --- a/docker-configs/docker-compose-ipv6.yml +++ b/docker-configs/docker-compose-ipv6.yml @@ -23,7 +23,6 @@ services: ipv6_address: fd2a:70b6:9f54:29b6::10 environment: - FDPROXY_IPV6=1 - - FD_DEFAULT_IPV6=1 ipv6nat: container_name: ipv6nat