website: Remove handling of GUIX_WEB_SITE_INFO.

* website/README: Remove documentation.
* website/apps/base/templates/help.scm (help-t): Use just one URL for
the refcard.
* website/apps/base/utils (guix-root-url-path): Use "/".
(builder): Remove big comment about bug #25227 and use expensive
builders.
* website/haunt.scm: Use guix.gnu.org domain.
This commit is contained in:
Ricardo Wurmus 2019-08-21 23:18:19 +02:00
parent 4ccdc58add
commit feb02faba5
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
5 changed files with 7 additions and 30 deletions

View File

@ -32,9 +32,6 @@ Then, visit http://localhost:8080/guix.html in a web browser.
You can stop the server pressing ~Ctrl + C~ twice.
To build the website for guix.info set the environment variable
=GUIX_WEB_SITE_INFO= first.
* Deploying
Like the pages of many GNU websites, this website is managed through

View File

@ -60,9 +60,7 @@
,(link-more
#:label "Get Guix reference card"
#:url (if (getenv "GUIX_WEB_SITE_INFO")
"https://www.gnu.org/software/guix/guix-refcard.pdf"
(guix-url "guix-refcard.pdf"))))
#:url (guix-url "guix-refcard.pdf")))
(div

View File

@ -46,9 +46,7 @@
(define guix-irc-log-url "http://logs.guix.gnu.org/guix")
(define guix-root-url-path
(if (getenv "GUIX_WEB_SITE_INFO")
(make-parameter "/")
(make-parameter "/software/guix/"))) ; Path to GNU Guix site in gnu.org
(make-parameter "/")) ; Path to GNU Guix site at guix.gnu.org
(define latest-guix-version
(make-parameter "1.0.1"))

View File

@ -60,24 +60,10 @@
A list of page objects that represent the web resources of the
application. See Haunt <page> objects for more information."
(flatten
(if (getenv "GUIX_WEB_SITE_INFO")
(list
(index-builder)
(packages-builder)
(package-list-builder))
;; These provisional builders are used because of a limitation of
;; the CVS repository used for deploying the website. The idea is
;; to have "package list" and "package detail" pages as proposed
;; in Guix bug #25227. This, however, would generate thousands of
;; pages that could choke the current CVS repository.
;;
;; When this limitation is gone, the above builders should be
;; used instead. They should generate pages as those described
;; in the proposal.
(list
(detailed-index-builder)
(detailed-package-list-builder)))))
(list
(index-builder)
(packages-builder)
(package-list-builder))))

View File

@ -14,9 +14,7 @@
(site #:title "GNU Guix"
#:domain (if (getenv "GUIX_WEB_SITE_INFO")
"https://guix.info"
"https://gnu.org/software/guix")
#:domain "https://guix.gnu.org"
#:build-directory "/tmp/gnu.org/software/guix"
#:readers (list sxml-reader html-reader commonmark-reader)
#:builders (list base:builder