canonical-hw-cert team mailing list archive

[Rod Smith <mp+432461@xxxxxxxxxxxxxxxxxx>]

Rod Smith has proposed merging ~rodsmith/maas-cert-server:link-to-offsite-docs into maas-cert-server:master.

Commit message:
Remove references to certification-docs in packaging, scripts, and index.html

Requested reviews:
  hardware-certification-users (hardware-certification)

For more details, see:
https://code.launchpad.net/~rodsmith/maas-cert-server/+git/maas-cert-server/+merge/432461

The certification-docs package is now an ex-package, gone to meet its maker; it's not simply pining for the fjords. Therefore, we need to remove references to it from maas-cert-server. These are:

* Dependencies in maas-cert-server and maas-lxc-boot packages
* Links to documentation files in index.html
* ln operations in maniacs-setup
-- 
Your team hardware-certification-users is requested to review the proposed merge of ~rodsmith/maas-cert-server:link-to-offsite-docs into maas-cert-server:master.

diff --git a/debian/changelog b/debian/changelog
index ef9ee45..61747bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+maas-cert-server (0.7.1-0ppa1) UNRELEASED; urgency=medium
+
+  * Remove references to certification-docs, which has been deprecated.
+
+ -- Rod Smith <rod.smith@xxxxxxxxxxxxx>  Tue, 01 Nov 2022 16:04:05 +0100
+
 maas-cert-server (0.7.0-0ppa1) jammy; urgency=medium
 
   * Update lxc-setup for Ubuntu 22.04
diff --git a/debian/control b/debian/control
index f334eac..7cc34c4 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Homepage: https://launchpad.net/maas-cert-server
 
 Package: maas-cert-server
 Architecture: all
-Depends: ${misc:Depends}, apache2, apt-mirror, certification-docs, certification-tools, distro-info, ipcalc, iperf, iperf3, jshon, net-tools, network-manager, postgresql, python3, wsmancli
+Depends: ${misc:Depends}, apache2, apt-mirror, certification-tools, distro-info, ipcalc, iperf, iperf3, jshon, net-tools, network-manager, postgresql, python3, wsmancli
 Description: Ubuntu certification support files for MAAS server
  Support files used on a MAAS server configured for use in Ubuntu server
  certification tasks.
@@ -24,7 +24,7 @@ Description: Ubuntu certification tools for use on both systems under test
 
 Package: maas-lxc-host
 Architecture: all
-Depends: ${misc:Depends}, amtterm, bridge-utils, certification-docs, distro-info, ipcalc, iperf, iperf3, jshon, net-tools, python3, wsmancli, zfsutils-linux
+Depends: ${misc:Depends}, amtterm, bridge-utils, distro-info, ipcalc, iperf, iperf3, jshon, net-tools, python3, wsmancli, zfsutils-linux
 Description: Ubuntu certification support files for MAAS server's LXC/LXD host
  Support files used on a computer serving as a LXC/LXD host for a MAAS server
  configured for use in Ubuntu server certification tasks.
diff --git a/index.html b/index.html
index 6eaff30..558f95a 100644
--- a/index.html
+++ b/index.html
@@ -21,13 +21,9 @@
       document.getElementById('maas').href=''+window.location.origin+':5240/MAAS/';
  </script></li>
 
-<li><a href="doc/Self-Test_Guide.html">Read the Server Self-Test Guide in HTML form</a></li>
+<li><a href="http://certification-static.canonical.com/docs/Ubuntu_Server_Hardware_Certification_Self-Testing_Guide.pdf";>Read the Server Self-Test Guide</a></li>
 
-<li><a href="doc/Self-Test_Guide.pdf">Read the Server Self-Test Guide in PDF form</a></li>
-
-<li><a href="doc/MAAS_Advanced_Network_Installation_And_Configuration_Scripted.html">Read the MAAS Advanced Network Installation and Configuration&mdash;Scripted (MANIACS) document in HTML form</a></li>
-
-<li><a href="doc/MAAS_Advanced_Network_Installation_And_Configuration_Scripted.pdf">Read the MAAS Advanced Network Installation and Configuration&mdash;Scripted (MANIACS) document in PDF form</a></li>
+<li><a href="http://certification-static.canonical.com/docs/MAAS_Advanced_Network_Installation_And_Configuration.pdf";>Read the MAAS Advanced Network Installation and Configuration&mdash;Scripted (MANIACS) document</a></li>
 
 <li><a href="cloud">Access cloud images downloads page</li>
 
diff --git a/usr/sbin/maniacs-setup b/usr/sbin/maniacs-setup
index 3104f45..4345f13 100755
--- a/usr/sbin/maniacs-setup
+++ b/usr/sbin/maniacs-setup
@@ -1000,10 +1000,7 @@ setup_weblinks() {
         cp /var/www/html/index.html /var/www/html/index.html-orig
     fi
     ln -sf /usr/share/maas-cert-server/index.html /var/www/html/
-    ln -sf /usr/share/doc/certification-docs/*.html /var/www/html/doc/
-    ln -sf /usr/share/doc/certification-docs/*.pdf /var/www/html/doc/
     rm -rf /var/www/html/doc/images
-    ln -sf /usr/share/doc/certification-docs/images /var/www/html/doc/
 }
 
 setup_repositories() {