From 45894c0c97098b3874880ae39321f1d715cf4e21 Mon Sep 17 00:00:00 2001 From: as598466 <124391092+as598466@users.noreply.github.com> Date: Sun, 30 Mar 2025 15:39:31 +0200 Subject: [PATCH 1/7] Update nginx.conf.template Add IPV6 compatibility --- nginx/nginx.conf.template | 1 + 1 file changed, 1 insertion(+) diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.template index cd16725b..7133bf60 100644 --- a/nginx/nginx.conf.template +++ b/nginx/nginx.conf.template @@ -29,6 +29,7 @@ http { server { listen 8000 deferred; + listen [::]:8000 deferred; client_max_body_size 0; server_name $WO_HOST; From a0efcc383c805256f1df782cbc2abe25876630f1 Mon Sep 17 00:00:00 2001 From: as598466 <124391092+as598466@users.noreply.github.com> Date: Sun, 30 Mar 2025 15:40:19 +0200 Subject: [PATCH 2/7] Add IPV6 compatibility --- nginx/nginx-ssl.conf.template | 1 + 1 file changed, 1 insertion(+) diff --git a/nginx/nginx-ssl.conf.template b/nginx/nginx-ssl.conf.template index bb6a9a10..1a23d7b6 100644 --- a/nginx/nginx-ssl.conf.template +++ b/nginx/nginx-ssl.conf.template @@ -36,6 +36,7 @@ http { server { listen 8000 deferred; + listen [::]:8000 deferred; client_max_body_size 0; server_name $WO_HOST; From ee024964432ae2496cb40f5253e5ee81d5fa3f6f Mon Sep 17 00:00:00 2001 From: as598466 <124391092+as598466@users.noreply.github.com> Date: Sun, 30 Mar 2025 15:44:46 +0200 Subject: [PATCH 4/7] Add IPV6 --- docker-compose.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 9c460d99..8425cd1f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -56,3 +56,11 @@ services: - WO_SECRET_KEY restart: unless-stopped oom_score_adj: 250 +networks: + default: + enable_ipv6: true + ipam: + driver: default + config: + - subnet: "172.21.0.0/16" + - subnet: "fdec:cc68:5178::/64" From e1af61fb0fb684dace5d87849fee344cf56fde94 Mon Sep 17 00:00:00 2001 From: as598466 <124391092+as598466@users.noreply.github.com> Date: Sun, 30 Mar 2025 16:50:40 +0200 Subject: [PATCH 5/7] Create docker-compose.ipv6.yml --- docker-compose.ipv6.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 docker-compose.ipv6.yml diff --git a/docker-compose.ipv6.yml b/docker-compose.ipv6.yml new file mode 100644 index 00000000..b6fbbf34 --- /dev/null +++ b/docker-compose.ipv6.yml @@ -0,0 +1,9 @@ +version: '2.2' +networks: + default: + enable_ipv6: true + ipam: + driver: default + config: + - subnet: "172.21.0.0/16" + - subnet: "fdec:cc68:5178::/64" From 2ecdf12ae927d6574be4153e2e1fc2f597054048 Mon Sep 17 00:00:00 2001 From: as598466 <124391092+as598466@users.noreply.github.com> Date: Sun, 30 Mar 2025 16:54:51 +0200 Subject: [PATCH 6/7] Update docker-compose.yml --- docker-compose.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8425cd1f..9c460d99 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -56,11 +56,3 @@ services: - WO_SECRET_KEY restart: unless-stopped oom_score_adj: 250 -networks: - default: - enable_ipv6: true - ipam: - driver: default - config: - - subnet: "172.21.0.0/16" - - subnet: "fdec:cc68:5178::/64" From 02eb8fd60380e823d4323a07b265ec98e35057ad Mon Sep 17 00:00:00 2001 From: as598466 <124391092+as598466@users.noreply.github.com> Date: Sun, 30 Mar 2025 17:07:53 +0200 Subject: [PATCH 7/7] Add IPV6 support --- webodm.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/webodm.sh b/webodm.sh index 10bf824c..793950a4 100755 --- a/webodm.sh +++ b/webodm.sh @@ -148,6 +148,10 @@ case $key in shift # past argument shift # past value ;; + --ipv6) + ipv6=true + shift # past argument + ;; *) # unknown option POSITIONAL+=("$1") # save it in an array for later shift # past argument @@ -192,6 +196,7 @@ usage(){ echo " --settings Path to a settings.py file to enable modifications of system settings (default: None)" echo " --worker-memory Maximum amount of memory allocated for the worker process (default: unlimited)" echo " --worker-cpus Maximum number of CPUs allocated for the worker process (default: all)" + echo " --ipv6 Enable IPV6" exit } @@ -457,6 +462,10 @@ start(){ command+=" -f docker-compose.worker-cpu.yml" fi + if [[ $ipv6 = true ]]; then + command+=" -f docker-compose.ipv6.yml" + fi + command="$command up" if [[ $detached = true ]]; then @@ -481,6 +490,10 @@ down(){ command+=" -f docker-compose.nodeodm.yml" fi + if [[ $ipv6 = true ]]; then + command+=" -f docker-compose.ipv6.yml" + fi + command+=" -f docker-compose.nodemicmac.yml down --remove-orphans" run "${command}" @@ -584,6 +597,10 @@ elif [[ $1 = "stop" ]]; then command+=" -f docker-compose.nodeodm.yml" fi + if [[ $ipv6 = true ]]; then + command+=" -f docker-compose.ipv6.yml" + fi + command+=" -f docker-compose.nodemicmac.yml stop" run "${command}" elif [[ $1 = "restart" ]]; then