Revert "Default IPv6 by environment variable"
This reverts commit fb1032e116ae2739d81acbd80aeb6c0a1feb0316.
This commit is contained in:
parent
fb1032e116
commit
075064a888
@ -33,7 +33,6 @@ import const
|
|||||||
import socket
|
import socket
|
||||||
import ipaddress
|
import ipaddress
|
||||||
from socket import gethostbyname
|
from socket import gethostbyname
|
||||||
import os
|
|
||||||
|
|
||||||
|
|
||||||
# Does anybody read this stuff? There's a PEP somewhere that says I should do this.
|
# 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')
|
'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:
|
try:
|
||||||
|
|
||||||
if CONFIG['SYSTEMS'][section]['IP'] == '::':
|
if CONFIG['SYSTEMS'][section]['IP'] == '::':
|
||||||
|
@ -23,7 +23,6 @@ services:
|
|||||||
ipv6_address: fd2a:70b6:9f54:29b6::10
|
ipv6_address: fd2a:70b6:9f54:29b6::10
|
||||||
environment:
|
environment:
|
||||||
- FDPROXY_IPV6=1
|
- FDPROXY_IPV6=1
|
||||||
- FD_DEFAULT_IPV6=1
|
|
||||||
|
|
||||||
ipv6nat:
|
ipv6nat:
|
||||||
container_name: ipv6nat
|
container_name: ipv6nat
|
||||||
|
Loading…
x
Reference in New Issue
Block a user