From d41acd7785f624ba827c6b457fc2afb5dc3603a2 Mon Sep 17 00:00:00 2001 From: Aleksander <170264518+t-aleksander@users.noreply.github.com> Date: Wed, 29 Apr 2026 11:52:27 +0200 Subject: [PATCH 1/2] fix labels --- web/messages/en/initial_wizard.json | 4 ++-- web/messages/en/migration_wizard.json | 4 ++-- .../pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/messages/en/initial_wizard.json b/web/messages/en/initial_wizard.json index 2e3db5514..a535e1cd0 100644 --- a/web/messages/en/initial_wizard.json +++ b/web/messages/en/initial_wizard.json @@ -123,9 +123,9 @@ "initial_setup_auto_adoption_mfa_option_internal_warning": "After completing the initial DefGuard setup, configure MFA in your profile to enable it.", "initial_setup_auto_adoption_mfa_option_external_title": "External Identity Provider Authentication", "initial_setup_auto_adoption_mfa_option_external_content": "Requires configuring an external identity provider in the settings, such as Google, Microsoft Entra ID, Okta, or JumpCloud.", - "initial_setup_auto_adoption_url_settings_defguard_description": "This URL will be used to access and control Defguard. It should not be exposed to the Internet, only to the internal or VPN network. Below, you can also configure how to secure it with HTTPS (via Defguard or an external reverse proxy).", + "initial_setup_auto_adoption_url_settings_defguard_description": "Enter the URL you've set up for Defguard, including the port if needed. Defguard needs to be reachable at this address on your internal or VPN network and it should not be exposed to the internet. Once setup is complete, you'll be redirected there automatically. Note that if you configure SSL below, Defguard will serve HTTPS on the same port it's currently running on.", "initial_setup_auto_adoption_url_settings_public_proxy_description": "The Edge component is meant to be exposed publicly to the Internet. It handles various tasks, such as enabling automated user enrollment and sending automated configuration updates to desktop and mobile clients. It requires a dedicated URL and must be publicly accessible on the Internet. You can change the public URL later in General Settings.", - "initial_setup_auto_adoption_internal_url_settings_url_description": "This URL will be used to access and control Defguard. It should not be exposed to the Internet, only to the internal or VPN network. Below, you can also configure how to secure it with HTTPS (via Defguard or an external reverse proxy).", + "initial_setup_auto_adoption_internal_url_settings_url_description": "Enter the URL you've set up for Defguard, including the port if needed. Defguard needs to be reachable at this address on your internal or VPN network and it should not be exposed to the internet. Once setup is complete, you'll be redirected there automatically. Note that if you configure SSL below, Defguard will serve HTTPS on the same port it's currently running on.", "initial_setup_auto_adoption_internal_url_settings_ssl_option_none": "Do not configure SSL", "initial_setup_auto_adoption_internal_url_settings_ssl_option_none_help": "You will manage SSL termination yourself, for example via a reverse proxy.", "initial_setup_auto_adoption_internal_url_settings_ssl_option_defguard_ca": "Generate certificates based on Defguard internal CA", diff --git a/web/messages/en/migration_wizard.json b/web/messages/en/migration_wizard.json index fe71efd0e..86802ef1e 100644 --- a/web/messages/en/migration_wizard.json +++ b/web/messages/en/migration_wizard.json @@ -34,9 +34,9 @@ "migration_wizard_support_video_guide_helper": "Watch a short tutorial video.", "migration_wizard_support_related_documentation": "Related documentation", "migration_wizard_general_config_private_url_title": "Private URL", - "migration_wizard_general_config_private_url_description": "This URL will be used to access and control Defguard. It should not be exposed to the Internet only to the internal or VPN network. You can learn more about our security approach in the video below.", + "migration_wizard_general_config_private_url_description": "Enter the URL you've set up for Defguard, including the port if needed. Defguard needs to be reachable at this address on your internal or VPN network and it should not be exposed to the internet. Once setup is complete, you'll be redirected there automatically. Note that if you configure SSL below, Defguard will serve HTTPS on the same port it's currently running on.", "migration_wizard_general_config_public_url_title": "Public URL", - "migration_wizard_general_config_public_url_description": "This URL will be used to access and control Defguard. It should not be exposed to the Internet only to the internal or VPN network. You can learn more about our security approach in the video below.", + "migration_wizard_general_config_public_url_description": "The Edge component is meant to be exposed publicly to the Internet. It handles various tasks, such as enabling automated user enrollment and sending automated configuration updates to desktop and mobile clients. It requires a dedicated URL and must be publicly accessible on the Internet. You can change the public URL later in General Settings.", "migration_wizard_edge_component_info": "We've detected your current Proxy setup. Please upgrade it to the latest 2.0 Edge component so it can be adopted automatically and managed by Defguard.", "migration_wizard_confirmation_title": "Initial system migration are complete.", "migration_wizard_confirmation_subtitle": "You've completed the first stage of the migration. Defguard is almost ready to go.", diff --git a/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx b/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx index 5f7965462..b4ed564dc 100644 --- a/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx +++ b/web/src/pages/GatewaySetupPage/steps/SetupDeployGatewayStep.tsx @@ -184,8 +184,8 @@ const PackageTab = () => { subtitle={m.gateway_setup_step_deploy_tabs_package_subtitle()} /> /dev/null + sudo tee /etc/apt/sources.list.d/defguard.list > /dev/null sudo apt update sudo apt install defguard-gateway`} From 9c7b2fdb8bfd91bf518836507f4e0a39835e00a5 Mon Sep 17 00:00:00 2001 From: Aleksander <170264518+t-aleksander@users.noreply.github.com> Date: Wed, 29 Apr 2026 12:26:33 +0200 Subject: [PATCH 2/2] fix another labels --- web/messages/en/initial_wizard.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/messages/en/initial_wizard.json b/web/messages/en/initial_wizard.json index a535e1cd0..23295b6be 100644 --- a/web/messages/en/initial_wizard.json +++ b/web/messages/en/initial_wizard.json @@ -201,9 +201,9 @@ "initial_setup_auto_adoption_summary_error_settings_timeout": "Timed out waiting for settings essentials.", "initial_setup_auto_adoption_summary_error_finish_console": "Failed to finish setup flow:", "initial_setup_auto_adoption_summary_thank_you": "Thank you for choosing Defguard.", - "initial_setup_auto_adoption_summary_note": "Please note that if the host running Defguard is not publicly accessible (i.e., it does not have the VPN public IP assigned to it), you must forward the following ports to it:", - "initial_setup_auto_adoption_summary_ports_http_https": "TCP ports 80 and 443", - "initial_setup_auto_adoption_summary_ports_wireguard": "UDP port {port}", + "initial_setup_auto_adoption_summary_note": "If the host running Defguard is behind a NAT or lacks a direct public IP assignment, you must configure your firewall to forward the following ports to the local Defguard instance:", + "initial_setup_auto_adoption_summary_ports_http_https": "Defguard Edge (public url): TCP ports 80 and 443 (or to your reverse proxy)", + "initial_setup_auto_adoption_summary_ports_wireguard": "WireGuard VPN UDP: port {port}", "initial_setup_auto_adoption_summary_encourage": "We would encourage you to:", "initial_setup_auto_adoption_summary_docs_icon_alt": "Documentation Icon", "initial_setup_auto_adoption_summary_docs_kicker": "Defguard insides",