From 961008bbe16ccb6538bb2cda524ba0262ac49bdf Mon Sep 17 00:00:00 2001 From: confusedalex Date: Fri, 1 Aug 2025 11:31:29 +0200 Subject: [PATCH 1/2] fix: adapt nix run command --- src/app/[orgId]/settings/sites/create/page.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/[orgId]/settings/sites/create/page.tsx b/src/app/[orgId]/settings/sites/create/page.tsx index e68e3830..f84416a7 100644 --- a/src/app/[orgId]/settings/sites/create/page.tsx +++ b/src/app/[orgId]/settings/sites/create/page.tsx @@ -291,10 +291,10 @@ WantedBy=default.target` }, nixos: { x86_64: [ - `nix run 'nixpkgs#fosrl-newt' --id ${id} --secret ${secret} --endpoint ${endpoint}` + `nix run 'nixpkgs#fosrl-newt' -- --id ${id} --secret ${secret} --endpoint ${endpoint}` ], aarch64: [ - `nix run 'nixpkgs#fosrl-newt' --id ${id} --secret ${secret} --endpoint ${endpoint}` + `nix run 'nixpkgs#fosrl-newt' -- --id ${id} --secret ${secret} --endpoint ${endpoint}` ] } }; From 664dbf3f4c00a45a9487ee9d4e2cac8af0675c66 Mon Sep 17 00:00:00 2001 From: Sebastian Felber Date: Mon, 4 Aug 2025 15:45:33 +0000 Subject: [PATCH 2/2] make IPv6 optional during install --- install/config/docker-compose.yml | 2 +- install/input.txt | 1 + install/main.go | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/install/config/docker-compose.yml b/install/config/docker-compose.yml index 4ce31e41..560ab530 100644 --- a/install/config/docker-compose.yml +++ b/install/config/docker-compose.yml @@ -60,4 +60,4 @@ networks: default: driver: bridge name: pangolin - enable_ipv6: true +{{if .EnableIPv6}} enable_ipv6: true{{end}} diff --git a/install/input.txt b/install/input.txt index 9ecf0d4d..12df39d7 100644 --- a/install/input.txt +++ b/install/input.txt @@ -1,6 +1,7 @@ docker example.com pangolin.example.com +yes admin@example.com yes admin@example.com diff --git a/install/main.go b/install/main.go index 9bb0c7e1..cea107d2 100644 --- a/install/main.go +++ b/install/main.go @@ -39,6 +39,7 @@ type Config struct { BadgerVersion string BaseDomain string DashboardDomain string + EnableIPv6 bool LetsEncryptEmail string EnableEmail bool EmailSMTPHost string @@ -303,6 +304,7 @@ func collectUserInput(reader *bufio.Reader) Config { fmt.Println("\n=== Basic Configuration ===") config.BaseDomain = readString(reader, "Enter your base domain (no subdomain e.g. example.com)", "") config.DashboardDomain = readString(reader, "Enter the domain for the Pangolin dashboard", "pangolin."+config.BaseDomain) + config.EnableIPv6 = readBool(reader, "Is your server IPv6 capable?", true) config.LetsEncryptEmail = readString(reader, "Enter email for Let's Encrypt certificates", "") config.InstallGerbil = readBool(reader, "Do you want to use Gerbil to allow tunneled connections", true)