]> git.proxmox.com Git - pve-installer.git/commitdiff
projects / pve-installer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cc120d7)
html: unify success template
authorThomas Lamprecht <t.lamprecht@proxmox.com>
Sun, 8 Nov 2020 17:50:25 +0000 (18:50 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Sun, 8 Nov 2020 18:06:37 +0000 (19:06 +0100)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
debian/pbs-installer.install patch | blob | blame | history
debian/pmg-installer.install patch | blob | blame | history
debian/pve-installer.install patch | blob | blame | history
html-common/Makefile patch | blob | blame | history
html-common/success.htm [new file with mode: 0644] patch | blob
html-pbs/success.htm [deleted file] patch | blob | blame | history
html-pmg/success.htm [deleted file] patch | blob | blame | history
html-pve/success.htm [deleted file] patch | blob | blame | history
proxinstall patch | blob | blame | history

diff --git a/debian/pbs-installer.install b/debian/pbs-installer.install
index ef95d9ab5863bd3cca7e37d4d405b69117f99d5f..0e8adb516feeecd52508cc07368a7eef78339077 100644 (file)
--- 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 8b608419c8e550407ce19553817448a31b6b5601..972d8a5de6f5287305db67d4bf34383b8d070304 100644 (file)
--- 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 bd498b12a49c34ee53d771bcbb5a043812751a12..3d1d3861927615ea9cdcf1b5c9caeb4ceeb820b8 100644 (file)
--- 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 4c90c6ed15fe398823d6a34dae5adfde2d5c9790..1485aa2ffda43ce59009827ca862e344823146c3 100644 (file)
--- 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-common/success.htm b/html-common/success.htm
new file mode 100644 (file)
index 0000000..4196f7f
--- /dev/null
+++ b/html-common/success.htm
@@ -0,0 +1,38 @@
+<!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 __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__:__PORT__
+          <br><br>
+          Also visit <a href="https://www.proxmox.com">www.proxmox.com</a> for more information.
+          <br><br>
+        </td>
+      </tr>
+    </table>
+    </p>
+  </td>
+  <td width="200">&nbsp;</td>
+</tr>
+</table>
+</center>
+</body>
+</html>
diff --git a/html-pbs/success.htm b/html-pbs/success.htm
deleted file mode 100644 (file)
index 848b69c..0000000
--- a/html-pbs/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 Backup Server 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>
-      </tr>
-    </table>
-    </p>
-  </td>
-  <td width="200">&nbsp;</td>
-</tr>
-</table>
-</center>
-</body>
-</html>
diff --git a/html-pmg/success.htm b/html-pmg/success.htm
deleted file mode 100644 (file)
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 (file)
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 436666c642622ec36c8edc51db4b98340a833047..5e40ed267962187f870bb7aaba6cbddea9b1bbc7 100755 (executable)
--- 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);
 
Bare Metal Installer