summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config-daemon.ac2
-rw-r--r--doc/guix.texi4
-rwxr-xr-xetc/guix-install.sh2
-rw-r--r--gnu/installer/newt/network.scm4
-rwxr-xr-xguix/scripts/substitute.scm4
-rw-r--r--guix/store.scm4
6 files changed, 10 insertions, 10 deletions
diff --git a/config-daemon.ac b/config-daemon.ac
index 86306effe1f..9188f93bda8 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -106,7 +106,7 @@ if test "x$guix_build_daemon" = "xyes"; then
106 106
107 dnl Determine the appropriate default list of substitute URLs (GnuTLS 107 dnl Determine the appropriate default list of substitute URLs (GnuTLS
108 dnl is required so we can default to 'https'.) 108 dnl is required so we can default to 'https'.)
109 guix_substitute_urls="https://ci.guix.gnu.org https://bordeaux.guix.gnu.org" 109 guix_substitute_urls="https://bordeaux.guix.gnu.org https://ci.guix.gnu.org"
110 110
111 AC_MSG_CHECKING([for default substitute URLs]) 111 AC_MSG_CHECKING([for default substitute URLs])
112 AC_MSG_RESULT([$guix_substitute_urls]) 112 AC_MSG_RESULT([$guix_substitute_urls])
diff --git a/doc/guix.texi b/doc/guix.texi
index 69a904473c4..ef9e4216b45 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -17,8 +17,8 @@
17@set BASE-URL https://ftp.gnu.org/gnu/guix 17@set BASE-URL https://ftp.gnu.org/gnu/guix
18 18
19@c The official substitute server used by default. 19@c The official substitute server used by default.
20@set SUBSTITUTE-SERVER-1 ci.guix.gnu.org 20@set SUBSTITUTE-SERVER-1 bordeaux.guix.gnu.org
21@set SUBSTITUTE-SERVER-2 bordeaux.guix.gnu.org 21@set SUBSTITUTE-SERVER-2 ci.guix.gnu.org
22@set SUBSTITUTE-URLS https://@value{SUBSTITUTE-SERVER-1} https://@value{SUBSTITUTE-SERVER-2} 22@set SUBSTITUTE-URLS https://@value{SUBSTITUTE-SERVER-1} https://@value{SUBSTITUTE-SERVER-2}
23 23
24@copying 24@copying
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 982fb0a2661..dde35e6d391 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -503,8 +503,8 @@ sys_enable_guix_daemon()
503sys_authorize_build_farms() 503sys_authorize_build_farms()
504{ # authorize the public key(s) of the build farm(s) 504{ # authorize the public key(s) of the build farm(s)
505 local hosts=( 505 local hosts=(
506 ci.guix.gnu.org
507 bordeaux.guix.gnu.org 506 bordeaux.guix.gnu.org
507 ci.guix.gnu.org
508 ) 508 )
509 509
510 if prompt_yes_no "Permit downloading pre-built package binaries from the \ 510 if prompt_yes_no "Permit downloading pre-built package binaries from the \
diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm
index ba26fc7c769..b22cc713054 100644
--- a/gnu/installer/newt/network.scm
+++ b/gnu/installer/newt/network.scm
@@ -127,8 +127,8 @@ FULL-VALUE tentatives, spaced by 1 second."
127 (lambda _ #f)) 127 (lambda _ #f))
128 (alarm 3)) 128 (alarm 3))
129 (lambda () 129 (lambda ()
130 (or (url-alive? "https://ci.guix.gnu.org") 130 (or (url-alive? "https://bordeaux.guix.gnu.org")
131 (url-alive? "https://bordeaux.guix.gnu.org"))) 131 (url-alive? "https://ci.guix.gnu.org")))
132 (lambda () 132 (lambda ()
133 (alarm 0)))) 133 (alarm 0))))
134 134
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index 3af0bf0019d..1b2d735d685 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -751,8 +751,8 @@ found."
751 (#f 751 (#f
752 ;; This can only happen when this script is not invoked by the 752 ;; This can only happen when this script is not invoked by the
753 ;; daemon. 753 ;; daemon.
754 '("http://ci.guix.gnu.org" 754 '("http://bordeaux.guix.gnu.org"
755 "http://bordeaux.guix.gnu.org")))) 755 "http://ci.guix.gnu.org"))))
756 756
757;; In order to prevent using large number of discovered local substitute 757;; In order to prevent using large number of discovered local substitute
758;; servers, limit the local substitute urls list size. 758;; servers, limit the local substitute urls list size.
diff --git a/guix/store.scm b/guix/store.scm
index 97c4f32a5ba..1229198b090 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -767,8 +767,8 @@ encoding conversion errors."
767 (map (if (false-if-exception (resolve-interface '(gnutls))) 767 (map (if (false-if-exception (resolve-interface '(gnutls)))
768 (cut string-append "https://" <>) 768 (cut string-append "https://" <>)
769 (cut string-append "http://" <>)) 769 (cut string-append "http://" <>))
770 '("ci.guix.gnu.org" 770 '("bordeaux.guix.gnu.org"
771 "bordeaux.guix.gnu.org"))) 771 "ci.guix.gnu.org")))
772 772
773(define (current-user-name) 773(define (current-user-name)
774 "Return the name of the calling user." 774 "Return the name of the calling user."