From 4d8dd1fb11bad97ad693726c4eb7cff3a4dd98f3 Mon Sep 17 00:00:00 2001 From: Aleksander <170264518+t-aleksander@users.noreply.github.com> Date: Tue, 17 Mar 2026 12:27:54 +0100 Subject: [PATCH 1/6] update helps --- web/messages/en/edge_wizard.json | 2 +- web/messages/en/gateway_wizard.json | 2 +- .../steps/SetupDeployGatewayStep.tsx | 34 +++++++++--------- .../pages/PlaygroundPage/PlaygroundPage.tsx | 13 +++---- .../SetupEdgeDeployStep.tsx | 35 ++++++++----------- 5 files changed, 38 insertions(+), 48 deletions(-) diff --git a/web/messages/en/edge_wizard.json b/web/messages/en/edge_wizard.json index 2b4d81c99e..1113df48b0 100644 --- a/web/messages/en/edge_wizard.json +++ b/web/messages/en/edge_wizard.json @@ -57,7 +57,7 @@ "edge_setup_step_deploy_tabs_package_subtitle": "To add Defguard APT repository and install the package, run the following commands:", "edge_setup_step_deploy_tabs_virtual_image": "Virtual Image", "edge_setup_step_deploy_tabs_virtual_title": "Virtual Image", - "edge_setup_step_deploy_tabs_virtual_subtitle": "Download latest Edge Virtual Image (in OVH format) from this url: [{url}]({url}) Prepare a Cloud Init configuration: **{filename}**:", + "edge_setup_step_deploy_tabs_virtual_subtitle": "Download latest Edge Virtual Image (in OVA format) from this url: [{url}]({url}) Prepare a Cloud Init configuration: **{filename}**:", "edge_setup_step_deploy_tabs_other": "Other methods", "edge_setup_step_deploy_tabs_other_title": "Other methods", "edge_setup_step_deploy_tabs_other_subtitle": "For other deployment methods, please follow to our documentation section", diff --git a/web/messages/en/gateway_wizard.json b/web/messages/en/gateway_wizard.json index b90c21f110..34d3b317bc 100644 --- a/web/messages/en/gateway_wizard.json +++ b/web/messages/en/gateway_wizard.json @@ -57,7 +57,7 @@ "gateway_setup_step_deploy_tabs_package_subtitle": "To add Defguard APT repository and install the package, run the following commands:", "gateway_setup_step_deploy_tabs_virtual_image": "Virtual Image", "gateway_setup_step_deploy_tabs_virtual_title": "Virtual Image", - "gateway_setup_step_deploy_tabs_virtual_subtitle": "Download latest Defguard Virtual Image (in OVH format) from this url: [{url}]({url}) Prepare a Cloud Init configuration: **{filename}**:", + "gateway_setup_step_deploy_tabs_virtual_subtitle": "Download latest Defguard Virtual Image (in OVA format) from this url: [{url}]({url}) Prepare a Cloud Init configuration: **{filename}**:", "gateway_setup_step_deploy_tabs_other": "Other methods", "gateway_setup_step_deploy_tabs_other_title": "Other methods", "gateway_setup_step_deploy_tabs_other_subtitle": "For other deployment methods, please follow to our documentation section", diff --git a/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx b/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx index 29c710f175..64a47fccea 100644 --- a/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx +++ b/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx @@ -129,11 +129,16 @@ const DockerComposeTab = () => { image: ghcr.io/defguard/gateway:latest restart: unless-stopped network_mode: host + cap_add: + - NET_ADMIN # If you prefer only one port: #ports: # - "50066:50066" + # Uncomment the following if you are running on Debian 13 or later or have apparmor or SELinux setup + #security_opt: + # - apparmor:unconfined volumes: - - ./certs:/certs`} + - ./.volumes/certs/gateway:/etc/defguard/certs`} /> @@ -153,7 +158,7 @@ const DockerTab = () => { subtitle={m.gateway_setup_step_deploy_tabs_docker_subtitle()} /> ); @@ -191,25 +196,18 @@ const VirtualImageTab = () => { ); diff --git a/web/src/pages/PlaygroundPage/PlaygroundPage.tsx b/web/src/pages/PlaygroundPage/PlaygroundPage.tsx index 55854468b7..5da0fa2cd4 100644 --- a/web/src/pages/PlaygroundPage/PlaygroundPage.tsx +++ b/web/src/pages/PlaygroundPage/PlaygroundPage.tsx @@ -125,15 +125,12 @@ export const PlaygroundPage = () => { diff --git a/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx b/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx index c001255da4..09cc5242ba 100644 --- a/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx +++ b/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx @@ -112,12 +112,14 @@ const DockerComposeTab = () => { /> @@ -137,7 +139,7 @@ const DockerTab = () => { subtitle={m.edge_setup_step_deploy_tabs_docker_subtitle()} /> ); @@ -176,24 +178,17 @@ const VirtualImageTab = () => { title={m.edge_setup_step_deploy_tabs_virtual_title()} subtitle={m.edge_setup_step_deploy_tabs_virtual_subtitle({ url: `https://defguard.net/download/defguard-2x-latest.ovf`, - filename: `cloud-init-yaml`, + filename: `defguard-data.yaml`, })} /> ); From e9d4e0918e3db2043a24129a7fd751df36816def Mon Sep 17 00:00:00 2001 From: Aleksander <170264518+t-aleksander@users.noreply.github.com> Date: Tue, 17 Mar 2026 12:38:05 +0100 Subject: [PATCH 2/6] modify wording --- web/messages/en/edge_wizard.json | 2 +- web/messages/en/gateway_wizard.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/messages/en/edge_wizard.json b/web/messages/en/edge_wizard.json index 1113df48b0..0a4a195c08 100644 --- a/web/messages/en/edge_wizard.json +++ b/web/messages/en/edge_wizard.json @@ -57,7 +57,7 @@ "edge_setup_step_deploy_tabs_package_subtitle": "To add Defguard APT repository and install the package, run the following commands:", "edge_setup_step_deploy_tabs_virtual_image": "Virtual Image", "edge_setup_step_deploy_tabs_virtual_title": "Virtual Image", - "edge_setup_step_deploy_tabs_virtual_subtitle": "Download latest Edge Virtual Image (in OVA format) from this url: [{url}]({url}) Prepare a Cloud Init configuration: **{filename}**:", + "edge_setup_step_deploy_tabs_virtual_subtitle": "Download latest Edge Virtual Image (in OVA format) from this url: [{url}]({url}). Then, prepare the following cloud init userdata to launch the Edge component: **{filename}**:", "edge_setup_step_deploy_tabs_other": "Other methods", "edge_setup_step_deploy_tabs_other_title": "Other methods", "edge_setup_step_deploy_tabs_other_subtitle": "For other deployment methods, please follow to our documentation section", diff --git a/web/messages/en/gateway_wizard.json b/web/messages/en/gateway_wizard.json index 34d3b317bc..1297020992 100644 --- a/web/messages/en/gateway_wizard.json +++ b/web/messages/en/gateway_wizard.json @@ -57,7 +57,7 @@ "gateway_setup_step_deploy_tabs_package_subtitle": "To add Defguard APT repository and install the package, run the following commands:", "gateway_setup_step_deploy_tabs_virtual_image": "Virtual Image", "gateway_setup_step_deploy_tabs_virtual_title": "Virtual Image", - "gateway_setup_step_deploy_tabs_virtual_subtitle": "Download latest Defguard Virtual Image (in OVA format) from this url: [{url}]({url}) Prepare a Cloud Init configuration: **{filename}**:", + "gateway_setup_step_deploy_tabs_virtual_subtitle": "Download latest Defguard Virtual Image (in OVA format) from this url: [{url}]({url}). Then, prepare the following cloud init userdata to launch the Gateway component: **{filename}**:", "gateway_setup_step_deploy_tabs_other": "Other methods", "gateway_setup_step_deploy_tabs_other_title": "Other methods", "gateway_setup_step_deploy_tabs_other_subtitle": "For other deployment methods, please follow to our documentation section", From 5eadc7122018f03face6997944fb6a71415bc22b Mon Sep 17 00:00:00 2001 From: Aleksander <170264518+t-aleksander@users.noreply.github.com> Date: Tue, 17 Mar 2026 12:45:08 +0100 Subject: [PATCH 3/6] fix ova download link --- .../wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx b/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx index 09cc5242ba..2bf43c176a 100644 --- a/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx +++ b/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx @@ -177,7 +177,7 @@ const VirtualImageTab = () => { From e5320acad43a73eb31323c4fbd7e27892a518778 Mon Sep 17 00:00:00 2001 From: Aleksander <170264518+t-aleksander@users.noreply.github.com> Date: Tue, 17 Mar 2026 12:47:36 +0100 Subject: [PATCH 4/6] expose proxy ports --- .../pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx | 2 +- .../wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx b/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx index 64a47fccea..42db17c5fa 100644 --- a/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx +++ b/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx @@ -125,7 +125,7 @@ const DockerComposeTab = () => { /> { edge: image: ghcr.io/defguard/defguard-proxy:latest restart: unless-stopped + ports: + - "8080:8080" + - "50051:50051" # Uncomment the following if you are running on Debian 13 or later or have apparmor or SELinux setup #security_opt: # - apparmor:unconfined @@ -139,7 +142,7 @@ const DockerTab = () => { subtitle={m.edge_setup_step_deploy_tabs_docker_subtitle()} /> ); From 9365ff073ee7c5a186ee4859d2f75912c169b031 Mon Sep 17 00:00:00 2001 From: Aleksander <170264518+t-aleksander@users.noreply.github.com> Date: Tue, 17 Mar 2026 13:12:24 +0100 Subject: [PATCH 5/6] fix --- .../wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx b/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx index 08af7f9559..f50cbbbb13 100644 --- a/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx +++ b/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx @@ -122,7 +122,7 @@ const DockerComposeTab = () => { #security_opt: # - apparmor:unconfined volumes: - - ./.volumes/certs/edge:/etc/defguard/certs"`} + - ./.volumes/certs/edge:/etc/defguard/certs`} /> @@ -142,7 +142,7 @@ const DockerTab = () => { subtitle={m.edge_setup_step_deploy_tabs_docker_subtitle()} /> ); From 75335f542bb8e2dea37db9c3457ace047bcd5d1e Mon Sep 17 00:00:00 2001 From: Aleksander <170264518+t-aleksander@users.noreply.github.com> Date: Tue, 17 Mar 2026 15:59:47 +0100 Subject: [PATCH 6/6] rephrase --- web/messages/en/edge_wizard.json | 2 +- web/messages/en/gateway_wizard.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/messages/en/edge_wizard.json b/web/messages/en/edge_wizard.json index 0a4a195c08..42fa5acd21 100644 --- a/web/messages/en/edge_wizard.json +++ b/web/messages/en/edge_wizard.json @@ -57,7 +57,7 @@ "edge_setup_step_deploy_tabs_package_subtitle": "To add Defguard APT repository and install the package, run the following commands:", "edge_setup_step_deploy_tabs_virtual_image": "Virtual Image", "edge_setup_step_deploy_tabs_virtual_title": "Virtual Image", - "edge_setup_step_deploy_tabs_virtual_subtitle": "Download latest Edge Virtual Image (in OVA format) from this url: [{url}]({url}). Then, prepare the following cloud init userdata to launch the Edge component: **{filename}**:", + "edge_setup_step_deploy_tabs_virtual_subtitle": "Download latest Edge Virtual Image (in OVA format) from this url: [{url}]({url}). Then include the snippet below as part of your cloud-init or create and attach a dedicated cloud-init userdata file: **{filename}**:", "edge_setup_step_deploy_tabs_other": "Other methods", "edge_setup_step_deploy_tabs_other_title": "Other methods", "edge_setup_step_deploy_tabs_other_subtitle": "For other deployment methods, please follow to our documentation section", diff --git a/web/messages/en/gateway_wizard.json b/web/messages/en/gateway_wizard.json index 1297020992..9c38211bf5 100644 --- a/web/messages/en/gateway_wizard.json +++ b/web/messages/en/gateway_wizard.json @@ -57,7 +57,7 @@ "gateway_setup_step_deploy_tabs_package_subtitle": "To add Defguard APT repository and install the package, run the following commands:", "gateway_setup_step_deploy_tabs_virtual_image": "Virtual Image", "gateway_setup_step_deploy_tabs_virtual_title": "Virtual Image", - "gateway_setup_step_deploy_tabs_virtual_subtitle": "Download latest Defguard Virtual Image (in OVA format) from this url: [{url}]({url}). Then, prepare the following cloud init userdata to launch the Gateway component: **{filename}**:", + "gateway_setup_step_deploy_tabs_virtual_subtitle": "Download latest Defguard Virtual Image (in OVA format) from this url: [{url}]({url}). Then include the snippet below as part of your cloud-init or create and attach a dedicated cloud-init userdata file: **{filename}**:", "gateway_setup_step_deploy_tabs_other": "Other methods", "gateway_setup_step_deploy_tabs_other_title": "Other methods", "gateway_setup_step_deploy_tabs_other_subtitle": "For other deployment methods, please follow to our documentation section",