From d283bb960f927dd5f7bb8b96bc697221e4e8ad39 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 9 Jul 2020 15:52:46 +0200
Subject: maint: Remove traces of "berlin.guixsd.org".

The guixsd.org domain is no longer advertised since before in 1.0.0
release in May 2019.

* etc/substitutes/berlin.guixsd.org.pub: Rename to...
* etc/substitutes/berlin.guix.gnu.org.pub: ... this.
* etc/substitutes/ci.guix.gnu.org.pub,
etc/substitutes/ci.guix.info.pub: Adjust accordingly.
* gnu/services/base.scm (%default-authorized-guix-keys): Likewise.
* guix/build/download-nar.scm (urls-for-item): Likewise.
* guix/self.scm (miscellaneous-files): Likewise.
* Makefile.am (dist_pkgdata_DATA): Likewise.
---
 etc/substitutes/berlin.guix.gnu.org.pub | 6 ++++++
 etc/substitutes/berlin.guixsd.org.pub   | 6 ------
 etc/substitutes/ci.guix.gnu.org.pub     | 2 +-
 etc/substitutes/ci.guix.info.pub        | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 etc/substitutes/berlin.guix.gnu.org.pub
 delete mode 100644 etc/substitutes/berlin.guixsd.org.pub

(limited to 'etc/substitutes')

diff --git a/etc/substitutes/berlin.guix.gnu.org.pub b/etc/substitutes/berlin.guix.gnu.org.pub
new file mode 100644
index 0000000000..f156a37b08
--- /dev/null
+++ b/etc/substitutes/berlin.guix.gnu.org.pub
@@ -0,0 +1,6 @@
+(public-key 
+ (ecc 
+  (curve Ed25519)
+  (q #8D156F295D24B0D9A86FA5741A840FF2D24F60F7B6C4134814AD55625971B394#)
+  )
+ )
diff --git a/etc/substitutes/berlin.guixsd.org.pub b/etc/substitutes/berlin.guixsd.org.pub
deleted file mode 100644
index f156a37b08..0000000000
--- a/etc/substitutes/berlin.guixsd.org.pub
+++ /dev/null
@@ -1,6 +0,0 @@
-(public-key 
- (ecc 
-  (curve Ed25519)
-  (q #8D156F295D24B0D9A86FA5741A840FF2D24F60F7B6C4134814AD55625971B394#)
-  )
- )
diff --git a/etc/substitutes/ci.guix.gnu.org.pub b/etc/substitutes/ci.guix.gnu.org.pub
index b1d1e4d763..0574f6dfab 120000
--- a/etc/substitutes/ci.guix.gnu.org.pub
+++ b/etc/substitutes/ci.guix.gnu.org.pub
@@ -1 +1 @@
-berlin.guixsd.org.pub
\ No newline at end of file
+berlin.guix.gnu.org.pub
\ No newline at end of file
diff --git a/etc/substitutes/ci.guix.info.pub b/etc/substitutes/ci.guix.info.pub
index b1d1e4d763..0574f6dfab 120000
--- a/etc/substitutes/ci.guix.info.pub
+++ b/etc/substitutes/ci.guix.info.pub
@@ -1 +1 @@
-berlin.guixsd.org.pub
\ No newline at end of file
+berlin.guix.gnu.org.pub
\ No newline at end of file
-- 
cgit v1.2.3