From cfb923645a045fb7b9418fd022d90c11d10fcf76 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Sun, 8 Nov 2020 18:50:25 +0100
Subject: [PATCH] html: unify success template

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 debian/pbs-installer.install          |  1 -
 debian/pmg-installer.install          |  1 -
 debian/pve-installer.install          |  1 -
 html-common/Makefile                  |  1 +
 {html-pbs => html-common}/success.htm | 19 +++++++++------
 html-pmg/success.htm                  | 35 ---------------------------
 html-pve/success.htm                  | 35 ---------------------------
 proxinstall                           |  4 ++-
 8 files changed, 15 insertions(+), 82 deletions(-)
 rename {html-pbs => html-common}/success.htm (50%)
 delete mode 100644 html-pmg/success.htm
 delete mode 100644 html-pve/success.htm

diff --git a/debian/pbs-installer.install b/debian/pbs-installer.install
index ef95d9a..0e8adb5 100644
--- a/debian/pbs-installer.install
+++ b/debian/pbs-installer.install
@@ -6,4 +6,3 @@ html-pbs/extract2-rulesystem.htm /var/lib/pve-installer/html
 html-pbs/extract3-spam.htm /var/lib/pve-installer/html
 html-pbs/extract4-virus.htm /var/lib/pve-installer/html
 html-pbs/fail.htm /var/lib/pve-installer/html
-html-pbs/success.htm /var/lib/pve-installer/html
diff --git a/debian/pmg-installer.install b/debian/pmg-installer.install
index 8b60841..972d8a5 100644
--- a/debian/pmg-installer.install
+++ b/debian/pmg-installer.install
@@ -6,4 +6,3 @@ html-pmg/extract2-rulesystem.htm /var/lib/pve-installer/html
 html-pmg/extract3-spam.htm /var/lib/pve-installer/html
 html-pmg/extract4-virus.htm /var/lib/pve-installer/html
 html-pmg/fail.htm /var/lib/pve-installer/html
-html-pmg/success.htm /var/lib/pve-installer/html
diff --git a/debian/pve-installer.install b/debian/pve-installer.install
index bd498b1..3d1d386 100644
--- a/debian/pve-installer.install
+++ b/debian/pve-installer.install
@@ -6,4 +6,3 @@ html-pve/extract2-rulesystem.htm /var/lib/pve-installer/html
 html-pve/extract3-spam.htm /var/lib/pve-installer/html
 html-pve/extract4-virus.htm /var/lib/pve-installer/html
 html-pve/fail.htm /var/lib/pve-installer/html
-html-pve/success.htm /var/lib/pve-installer/html
diff --git a/html-common/Makefile b/html-common/Makefile
index 4c90c6e..1485aa2 100644
--- a/html-common/Makefile
+++ b/html-common/Makefile
@@ -12,6 +12,7 @@ install:
 	install -D -m 644 nohds.htm ${DESTDIR}/var/lib/pve-installer/html/nohds.htm
 	install -D -m 644 nonics.htm ${DESTDIR}/var/lib/pve-installer/html/nonics.htm
 	install -D -m 644 ack_template.htm ${DESTDIR}/var/lib/pve-installer/html/ack_template.htm
+	install -D -m 644 success.htm ${DESTDIR}/var/lib/pve-installer/html/success.htm
 
 .phony: clean
 clean:
diff --git a/html-pbs/success.htm b/html-common/success.htm
similarity index 50%
rename from html-pbs/success.htm
rename to html-common/success.htm
index 848b69c..4196f7f 100644
--- a/html-pbs/success.htm
+++ b/html-common/success.htm
@@ -12,17 +12,20 @@
     <p>
     <b class="htext">Installation successful!</b>
     <br><br><br>
-    The Proxmox Backup Server is now installed and ready to use.
+    The __FULL_PRODUCT_NAME__ is now installed and ready to use.
     <br><br><br>
     <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 on port 8007:<br><br>
-	  https://@IPADDR@:8007
-	  <br><br>
-	  Also visit <a href="https://www.proxmox.com">www.proxmox.com</a> for more information.
-	</td>
+        <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 on port 8007:<br><br>
+            https://__IPADDR__:__PORT__
+          <br><br>
+          Also visit <a href="https://www.proxmox.com">www.proxmox.com</a> for more information.
+          <br><br>
+        </td>
       </tr>
     </table>
     </p>
diff --git a/html-pmg/success.htm b/html-pmg/success.htm
deleted file mode 100644
index ef2ecb3..0000000
--- a/html-pmg/success.htm
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="pve-installer.css">
-</head>
-<body>
-<center>
-<table border="0" width="800">
-<tr>
-  <td width="200">&nbsp;</td>
-  <td colspan="2" width="400"><br><br>
-    <p>
-    <b class="htext">Installation successful!</b>
-    <br><br><br>
-    The Proxmox Mail Gateway is now installed and ready to use.
-    <br><br><br>
-    <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 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>
-      </tr>
-    </table>
-    </p>
-  </td>
-  <td width="200">&nbsp;</td>
-</tr>
-</table>
-</center>
-</body>
-</html>
diff --git a/html-pve/success.htm b/html-pve/success.htm
deleted file mode 100644
index 954fde5..0000000
--- a/html-pve/success.htm
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="pve-installer.css">
-</head>
-<body>
-<center>
-<table border="0" width="800">
-<tr>
-  <td width="200">&nbsp;</td>
-  <td colspan="2" width="400"><br><br>
-    <p>
-    <b class="htext">Installation successful!</b>
-    <br><br><br>
-    The Proxmox Virtual Environment is now installed and ready to use.
-    <br><br><br>
-    <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 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>
-      </tr>
-    </table>
-    </p>
-  </td>
-  <td width="200">&nbsp;</td>
-</tr>
-</table>
-</center>
-</body>
-</html>
diff --git a/proxinstall b/proxinstall
index 436666c..5e40ed2 100755
--- a/proxinstall
+++ b/proxinstall
@@ -1988,8 +1988,10 @@ sub display_html {
 	$data =~ s/__LICENSE_TITLE__/$title/;
     } elsif ($filename eq 'success.htm') {
 	my $addr = $ipversion == 6 ? "[${ipaddress}]" : "$ipaddress";
-	$data =~ s/\@IPADDR\@/$addr/;
+	$data =~ s/__IPADDR__/$addr/g;
+	$data =~ s/__PORT__/$product->{port}/g;
     }
+    $data =~ s/__FULL_PRODUCT_NAME__/$product->{fullname}/g;
 
     $htmlview->load_html($data, $url);
 
-- 
2.39.2