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.

3 files changed, 6 insertions, 24 deletions

diff --git a/website/apps/base/templates/help.scm b/website/apps/base/templates/help.scm
index ce04032..8117957 100644
--- a/website/apps/base/templates/help.scm
+++ b/website/apps/base/templates/help.scm
@@ -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
diff --git a/website/apps/base/utils.scm b/website/apps/base/utils.scm
index ba812cd..d57ec7c 100644
--- a/website/apps/base/utils.scm
+++ b/website/apps/base/utils.scm
@@ -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"))
diff --git a/website/apps/packages/builder.scm b/website/apps/packages/builder.scm
index 59f86c1..40a54f9 100644
--- a/website/apps/packages/builder.scm
+++ b/website/apps/packages/builder.scm
@@ -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))))