wireguard.cgi: Correctly compose the FQDN

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/wireguard.cgi b/html/cgi-bin/wireguard.cgi
index f1e8eda9131ae6bd70a632ea3074523ec9a30ac2..bcc51a7b6ab82e69f0817d6d28f9b7484bac5bbb 100644 (file)
--- a/html/cgi-bin/wireguard.cgi
+++ b/html/cgi-bin/wireguard.cgi
@@ -1245,6 +1245,13 @@ sub generate_client_configuration($) {
                push(@allowed_ips, "${netaddress}/${prefix}");
        }
 
+       # Build the FQDN of the firewall
+       my $fqdn = join(".", (
+               $General::mainsettings{'HOSTNAME'},
+               $General::mainsettings{'DOMAINNAME'},
+       ));
+       my $port = $settings{'PORT'};
+
        my @conf = (
                "[Interface]",
                "PrivateKey = $peer->{'PRIVATE_KEY'}",
@@ -1252,7 +1259,7 @@ sub generate_client_configuration($) {
                "",
 
                "[Peer]",
-               "Endpoint = $General::main{'HOSTNAME'}.$General::main{'DOMAINNAME'}",
+               "Endpoint = ${fqdn}:${port}",
                "PublicKey = $settings{'PUBLIC_KEY'}",
                "PresharedKey = $peer->{'PSK'}",
                "AllowedIPs = " . join(", ", @allowed_ips),