05/06: website: Change download URLs to ftp.gnu.org.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix-artwork.

commit 1196178b107323a213edd18dc51829e5a42b5d6d
Author: Ludovic Courtès <address@hidden>
Date:   Thu May 2 13:04:42 2019 +0200

    website: Change download URLs to ftp.gnu.org.
    
    * website/apps/download/data.scm (system-downloads): Switch to
    ftp.gnu.org and adjust file names.
    * website/apps/download/templates/download.scm (download-t): Likewise.
    Mention alpha.gnu.org.
    * website/apps/download/types.scm: Update comment.
---
 website/apps/download/data.scm               | 10 +++++-----
 website/apps/download/templates/download.scm |  5 ++++-
 website/apps/download/types.scm              |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/website/apps/download/data.scm b/website/apps/download/data.scm
index dfa5085..5f10262 100644
--- a/website/apps/download/data.scm
+++ b/website/apps/download/data.scm
@@ -31,7 +31,7 @@
        (a (@ (href ,(guix-url "contribute"))) "help") "!")
       (p "USB/DVD ISO installer of the standalone Guix System."))
     #:image (guix-url "static/base/img/GuixSD-package.png")
-    #:base-url (string-append "https://alpha.gnu.org/gnu/guix/guixsd-install-";
+    #:base-url (string-append 
"https://ftp.gnu.org/gnu/guix/guix-system-install-";
                              (latest-guix-version) ".")
     #:variants (list (variant "x86_64" "x86_64-linux.iso.xz")
                     (variant "i686" "i686-linux.iso.xz"))
@@ -43,10 +43,10 @@
     `(div
       (p "QCOW2 virtual machine (VM) image."))
     #:image (guix-url "static/base/img/QEMU-package.png")
-    #:base-url (string-append "https://alpha.gnu.org/gnu/guix/guixsd-vm-image-";
+    #:base-url (string-append 
"https://ftp.gnu.org/gnu/guix/guix-system-vm-image-";
                              (latest-guix-version) ".")
     #:variants (list (variant "x86_64" "x86_64-linux.xz"))
-    #:manual (manual-url "Running-GuixSD-in-a-VM.html"))
+    #:manual (manual-url "Running-Guix-in-a-VM.html"))
 
    (download
     #:title (string-append "GNUÂ Guix " (latest-guix-version) " Binary")
@@ -55,7 +55,7 @@
       "Self-contained tarball providing binaries for Guix and its
       dependencies, to be installed on top of your Linux-based system.")
     #:image (guix-url "static/base/img/Guix-package.png")
-    #:base-url (string-append "https://alpha.gnu.org/gnu/guix/guix-binary-";
+    #:base-url (string-append "https://ftp.gnu.org/gnu/guix/guix-binary-";
                              (latest-guix-version) ".")
     #:variants (list (variant "x86_64" "x86_64-linux.tar.xz")
                     (variant "i686" "i686-linux.tar.xz")
@@ -67,7 +67,7 @@
     #:title (string-append "GNUÂ Guix " (latest-guix-version) " Source")
     #:description '(p "Source code distribution.")
     #:image (guix-url "static/base/img/src-package.png")
-    #:base-url (string-append "https://alpha.gnu.org/gnu/guix/guix-";
+    #:base-url (string-append "https://ftp.gnu.org/gnu/guix/guix-";
                              (latest-guix-version) ".")
     #:variants (list (variant "tarball" "tar.gz"))
     #:manual (manual-url "Requirements.html"))))
diff --git a/website/apps/download/templates/download.scm 
b/website/apps/download/templates/download.scm
index 9218531..f888a0b 100644
--- a/website/apps/download/templates/download.scm
+++ b/website/apps/download/templates/download.scm
@@ -71,5 +71,8 @@
        (@ (class "centered-block limit-width"))
        "Source code and binaries for the Guix System distribution ISO
        image as well as GNU Guix can be found on the GNU servers at "
+       (a (@ (href "https://ftp.gnu.org/gnu/guix/";))
+         "https://ftp.gnu.org/gnu/guix/";)
+       ".  Older releases can still be found on "
        (a (@ (href "https://alpha.gnu.org/gnu/guix/";))
-         "https://alpha.gnu.org/gnu/guix/";) ".")))))
+          "alpha.gnu.org") ".")))))
diff --git a/website/apps/download/types.scm b/website/apps/download/types.scm
index 0067ef9..fb1bc55 100644
--- a/website/apps/download/types.scm
+++ b/website/apps/download/types.scm
@@ -49,7 +49,7 @@
 ;;; base-url (string)
 ;;;   The base URL where all the variants of the download can be
 ;;;   found. For example:
-;;;   "https://alpha.gnu.org/gnu/guix/guixsd-usb-install-0.12.0";
+;;;   "https://ftp.gnu.org/gnu/guix/guix-system-install-0.12.0";
 ;;;
 ;;; variants (list)
 ;;;   A list of <variant> objects that represent the different flavors