bug#25980: [PATCH] website: Provide https links for alpha.gnu.org URLs.

[ng0]

On 17-03-05 17:37:58, address@hidden wrote:
> From: ng0 <address@hidden>
> 
> alpha.gnu.org is accessible via https, defaulting to
> ftp protocol prevents users of networks where the ftp
> ports might be blocked (such as tor) from downloading.
> 

It doesn't prevent them, but directly offering https makes it easier at
first try.
I only found out some days ago that alpha.gnu.org and all other gnu.org
ftp servers are accessible via http/https, previously I thought it's one
of those FTPs which are limited to ftp protocol.

Even with the text on the page (http://alpha....) this lowers the
barrier as links are available which are not ftp.

> * website/www/download.scm (https-url): New variable.
> (guixsd-files): Replace (ftp-url) with (https-url).
> (guix-files): Likewise.
> (guix-source-files): Likewise.
> ---
>  website/www/download.scm | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/website/www/download.scm b/website/www/download.scm
> index db51516..887c6db 100644
> --- a/website/www/download.scm
> +++ b/website/www/download.scm
> @@ -1,6 +1,7 @@
>  ;;; GuixSD website --- GNU's advanced distro website
>  ;;; Copyright © 2015, 2016 Ludovic Courtès <address@hidden>
>  ;;; Copyright © 2015 Mathieu Lirzin <address@hidden>
> +;;; Copyright © 2017 ng0 <address@hidden>
>  ;;; Initially written by Luis Felipe López Acevedo <address@hidden>
>  ;;; who waives all copyright interest on this file.
>  ;;;
> @@ -64,22 +65,25 @@ dependencies.")
>  (define (ftp-url file)
>    (string-append "ftp://alpha.gnu.org/gnu/guix/"; file))
>  
> +(define (https-url file)
> +  (string-append "https://alpha.gnu.org/gnu/guix/"; file))
> +
>  (define (guixsd-files archs)
>    (map (lambda (arch)
> -         (cons arch (ftp-url (string-append "guixsd-usb-install-"
> +         (cons arch (https-url (string-append "guixsd-usb-install-"
>                                              (latest-guix-version) "." arch
>                                              "-linux.xz"))))
>         archs))
>  
>  (define (guix-files archs)
>    (map (lambda (arch)
> -         (cons arch (ftp-url (string-append "guix-binary-" 
> (latest-guix-version)
> +         (cons arch (https-url (string-append "guix-binary-" 
> (latest-guix-version)
>                                              "." arch "-linux.tar.xz"))))
>         archs))
>  
>  (define (guix-source-files variants)
>    (map (lambda (variant)
> -         (cons variant (ftp-url (string-append "guix-" (latest-guix-version)
> +         (cons variant (https-url (string-append "guix-" 
> (latest-guix-version)
>                                                 ".tar.gz"))))
>         variants))
>  
> -- 
> 2.12.0
>