01/04: hydra: nginx: Update the bordeaux.guix.gnu.org HTML file.

[Christopher Baines]

cbaines pushed a commit to branch master
in repository maintenance.

commit e901a8808f708323b5518c8dc6d15b78621aa22d
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Tue Jan 17 09:19:22 2023 +0000

    hydra: nginx: Update the bordeaux.guix.gnu.org HTML file.
    
    * hydra/nginx/html/bordeaux/index.html: Update usage instructions now
    that bordeaux is a default substitute server.  Also update status of
    i586-gnu substitutes.
---
 hydra/nginx/html/bordeaux/index.html | 48 +++++++++---------------------------
 1 file changed, 11 insertions(+), 37 deletions(-)

diff --git a/hydra/nginx/html/bordeaux/index.html 
b/hydra/nginx/html/bordeaux/index.html
index ffd519f..3940733 100644
--- a/hydra/nginx/html/bordeaux/index.html
+++ b/hydra/nginx/html/bordeaux/index.html
@@ -119,7 +119,7 @@
         Availability for <b>x86_64-linux</b>, <b>i686-linux</b>,
         <b>aarch64-linux</b>, <b>armhf-linux</b> and
         <b>powerpc64le-linux</b> should be good.  <b>i586-gnu</b>
-        substitutes aren't currently available.
+        substitutes are a work in progress.
       </p>
 
       <p>
@@ -130,6 +130,11 @@
     </div>
 
     <h2>Using these substitutes</h2>
+    <p>
+      bordeaux.guix.gnu.org is a default substitute server in recent
+      versions of Guix, so no manual configuration should be
+      necessary.
+    </p>
     <p>
       The URL to use to fetch substitutes is 
<code>https://bordeaux.guix.gnu.org</code>,
       and they're signed with the following key.
@@ -143,42 +148,11 @@
 
     <h3>On a Guix System</h3>
     <p>
-      Users of Guix System can start using these substitutes with a
-      bit of scheme code that looks like:
-
-      <pre>(define %my-desktop-services
-  (modify-services
-      %desktop-services
-    (guix-service-type
-     config =>
-     (guix-configuration
-      (inherit config)
-      (substitute-urls
-       (append (list "https://bordeaux.guix.gnu.org/";)
-               %default-substitute-urls))
-      (authorized-keys
-       (append
-        (list
-         (plain-file
-                     "bordeaux.guix.gnu.org.signing.key"
-                     "
-(public-key
- (ecc
-  (curve Ed25519)
-  (q #7D602902D3A2DBB83F8A0FB98602A754C5493B0B778C8D1DD4E0F41DE14DE34F#)
-  )
- )"))
-        %default-authorized-guix-keys)))))))
-
-
-(operating-system
-    ...
-    (services (append (list (service dhcp-client-service-type)
-                            (service openssh-service-type
-                                     (openssh-configuration
-                                      (openssh openssh-sans-x)
-                                      (port-number 2222))))
-                      %my-desktop-services)))</pre>
+      With recent versions of Guix, the
+      <code>%default-substitute-urls</code> and
+      <code>%default-authorized-guix-keys</code> should include
+      bordeaux.guix.gnu.org, so no extra configuration should be
+      necessary.
     </p>
   </body>
 </html>