success: show real final IP addr with port

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/html-pmg/success.htm b/html-pmg/success.htm
index ca7024abcd19cc3f782ede929655fa113e0ddb09..ef2ecb33bbc753fe8d7261db4ab7ef76d71564ed 100644 (file)
--- a/html-pmg/success.htm
+++ b/html-pmg/success.htm
@@ -14,12 +14,12 @@
     <br><br><br>
     The Proxmox Mail Gateway is now installed and ready to use.
     <br><br><br>
-    <table border="0" width="400">
+    <table border="0" width="500">
       <tbody><tr>
        <td width="40">&nbsp;</td>
        <td valign="top" width="30"><img src="plus.png"></td>
-       <td valign="top" width="560"><b>Next steps</b><br><br>Reboot and point your web browser to the selected IP address:<br><br>
-         https://&lt;IP&gt;:8006
+       <td valign="top" width="560"><b>Next steps</b><br><br>Reboot and point your web browser to the selected IP address on port 8006:<br><br>
+         https://@IPADDR@:8006
          <br><br>
          Also visit <a href="https://www.proxmox.com">www.proxmox.com</a> for more information.
        </td>

diff --git a/html-pve/success.htm b/html-pve/success.htm
index e9c36d8b0e115c7d0049312cb8ed34ca759c7028..954fde56bd754313b47612a82a861d17e30ed5e8 100644 (file)
--- a/html-pve/success.htm
+++ b/html-pve/success.htm
@@ -14,11 +14,12 @@
     <br><br><br>
     The Proxmox Virtual Environment is now installed and ready to use.
     <br><br><br>
-    <table border="0" width="400">
+    <table border="0" width="500">
       <tbody><tr>
        <td width="40">&nbsp;</td>
        <td valign="top" width="30"><img src="plus.png"></td>
-       <td valign="top" width="560"><b>Next steps</b><br><br>Reboot and point your web browser to the selected IP address.
+       <td valign="top" width="560"><b>Next steps</b><br><br>Reboot and point your web browser to the selected IP address on port 8006:<br><br>
+         https://@IPADDR@:8006
          <br><br>
          Also visit <a href="https://www.proxmox.com">www.proxmox.com</a> for more information.
        </td>

diff --git a/proxinstall b/proxinstall
index b06da138a166a46a64a349c30dd62e95722636cf..f7d6e29bc659fd00fc1653a40f3fbb7015675811 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -1868,6 +1868,9 @@ sub display_html {
        my $title = "END USER LICENSE AGREEMENT (EULA)";
        $data =~ s/__LICENSE__/$license/;
        $data =~ s/__LICENSE_TITLE__/$title/;
+    } elsif ($filename eq 'success.htm') {
+       my $addr = $ipversion == 6 ? "[${ipaddress}]" : "$ipaddress";
+       $data =~ s/\@IPADDR\@/$addr/;
     }
 
     $htmlview->load_html($data, $url);