From bc5f18ee37a9a4b3e77d895fcc255b65ca3af033 Mon Sep 17 00:00:00 2001
From: Luis Guzman <ark@switnet.org>
Date: Tue, 19 Jan 2021 13:23:15 -0600
Subject: [PATCH] Update to new domain

---
 helpers/make-apt-setup | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/helpers/make-apt-setup b/helpers/make-apt-setup
index f1d0f87d..dd6f489f 100644
--- a/helpers/make-apt-setup
+++ b/helpers/make-apt-setup
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=2
 NETINST=true
 . ./config
 
@@ -48,9 +48,9 @@ sed ${START},${END}d debian/apt-mirror-setup.templates -i
 /Canonical/d;
 s/main restricted universe multiverse/main/g;
 s/dists restricted/dists/g;
-s/archive.ubuntu.com/archive.trisquel.info/g;
-s/security.ubuntu.com/archive.trisquel.info/g;
-s/ports.ubuntu.com/archive.trisquel.info/g;
+s/archive.ubuntu.com/archive.trisquel.org/g;
+s/security.ubuntu.com/archive.trisquel.org/g;
+s/ports.ubuntu.com/archive.trisquel.org/g;
 s/Ubuntu/Trisquel/g;
 s/ubuntu/trisquel/g;
 s/universe/main/g;
@@ -58,24 +58,24 @@ s/main main/main/g;
 s:help.trisquel.com/community/UpgradeNotes:trisquel.info/wiki/:g;' generators/* -i
 
 replace "Default: /ubuntu" "Default: /trisquel" .
-replace "security.ubuntu.com" "archive.trisquel.info" .
-replace "archive.ubuntu.com" "archive.trisquel.info" .
+replace "security.ubuntu.com" "archive.trisquel.org" .
+replace "archive.ubuntu.com" "archive.trisquel.org" .
 replace "Ubuntu" "Trisquel" .
 
 cd release-files
 rm -rf *
 for DIST in $CODENAME $CODENAME-security $CODENAME-updates $CODENAME-backports
 do
-    wget -r -l1 -np http://archive.trisquel.info/trisquel/dists/$DIST
+    wget -r -l1 -np http://archive.trisquel.org/trisquel/dists/$DIST
 done
-find archive.trisquel.info/ |egrep '(index.html|robots.txt)'|xargs rm
+find archive.trisquel.org/ |egrep '(index.html|robots.txt)'|xargs rm
 cd ..
 
 rm generators/9[1-9]* generators/50mirror generators/50mirror.ubuntu
 sed -i '/generators\/9[1-9]*/d' debian/apt-setup-udeb.install
 
 echo "generators/50mirror.trisquel usr/lib/apt-setup/generators
-release-files/archive.trisquel.info usr/share/apt-setup/release-files" > debian/apt-mirror-setup.install
+release-files/archive.trisquel.org usr/share/apt-setup/release-files" > debian/apt-mirror-setup.install
 
 echo '#!/bin/sh
 set -e
@@ -183,7 +183,7 @@ ${COMMENT}deb $protocol://$hostname$directory $codename-backports main
 ${COMMENT}deb-src $protocol://$hostname$directory $codename-backports main
 EOF
 
-apt-setup-signed-release archive.trisquel.info "$file"
+apt-setup-signed-release archive.trisquel.org "$file"
 
 exit 0
 ' > generators/50mirror.trisquel
-- 
GitLab