From 9dd6c6cf9231b508a9d6498521403a2ec4838318 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Dec 2013 15:38:27 +0000 Subject: [PATCH] * Use releases.nixos.org. git-svn-id: https://nixos.org/repos/nix/release/trunk/channels@34805 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb --- mirror-nixos-branch.sh | 4 ++-- mirror-nixos-stable.sh | 16 ++++++++-------- mirror-nixpkgs.sh | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mirror-nixos-branch.sh b/mirror-nixos-branch.sh index af8ef86..d3bcd2a 100755 --- a/mirror-nixos-branch.sh +++ b/mirror-nixos-branch.sh @@ -73,8 +73,8 @@ rsync -avR . hydra-mirror@nixos.org:"$releasesDir" --exclude .htaccess --exclude # Update the channel. htaccess=$channelsDir/.htaccess-$channelName -echo "Redirect /channels/$channelName http://nixos.org/releases/nixos/$branch/$release" > $htaccess.tmp -echo "Redirect /releases/nixos/channels/$channelName http://nixos.org/releases/nixos/$branch/$release" >> $htaccess.tmp # obsolete +echo "Redirect /channels/$channelName http://releases.nixos.org/nixos/$branch/$release" > $htaccess.tmp +echo "Redirect /releases/nixos/channels/$channelName http://releases.nixos.org/nixos/$branch/$release" >> $htaccess.tmp # obsolete mv $htaccess.tmp $htaccess ln -sfn $releaseDir $channelsDir/$channelName # dummy symlink diff --git a/mirror-nixos-stable.sh b/mirror-nixos-stable.sh index 5fcc6ae..5f20b48 100755 --- a/mirror-nixos-stable.sh +++ b/mirror-nixos-stable.sh @@ -9,20 +9,20 @@ release=$(basename $releaseDir) # Generate a .htaccess with some symbolic redirects to the latest ISOs. htaccess=/data/releases/nixos/.htaccess -baseURL="http://nixos.org/releases/nixos/$version/$release" -echo "Redirect /releases/nixos/latest $baseURL" > $htaccess.tmp +baseURL="http://releases.nixos.org/nixos/$version/$release" +echo "Redirect /nixos/latest $baseURL" > $htaccess.tmp fn=$(cd $releaseDir && echo nixos-minimal-*-i686-linux.iso) -echo "Redirect /releases/nixos/latest-iso-minimal-i686-linux $baseURL/$fn" >> $htaccess.tmp +echo "Redirect /nixos/latest-iso-minimal-i686-linux $baseURL/$fn" >> $htaccess.tmp fn=$(cd $releaseDir && echo nixos-minimal-*-x86_64-linux.iso) -echo "Redirect /releases/nixos/latest-iso-minimal-x86_64-linux $baseURL/$fn" >> $htaccess.tmp +echo "Redirect /nixos/latest-iso-minimal-x86_64-linux $baseURL/$fn" >> $htaccess.tmp fn=$(cd $releaseDir && echo nixos-graphical-*-i686-linux.iso) -echo "Redirect /releases/nixos/latest-iso-graphical-i686-linux $baseURL/$fn" >> $htaccess.tmp +echo "Redirect /nixos/latest-iso-graphical-i686-linux $baseURL/$fn" >> $htaccess.tmp fn=$(cd $releaseDir && echo nixos-graphical-*-x86_64-linux.iso) -echo "Redirect /releases/nixos/latest-iso-graphical-x86_64-linux $baseURL/$fn" >> $htaccess.tmp +echo "Redirect /nixos/latest-iso-graphical-x86_64-linux $baseURL/$fn" >> $htaccess.tmp fn=$(cd $releaseDir && echo nixos-*-i686-linux.ova) -echo "Redirect /releases/nixos/latest-ova-i686-linux $baseURL/$fn" >> $htaccess.tmp +echo "Redirect /nixos/latest-ova-i686-linux $baseURL/$fn" >> $htaccess.tmp fn=$(cd $releaseDir && echo nixos-*-x86_64-linux.ova) -echo "Redirect /releases/nixos/latest-ova-x86_64-linux $baseURL/$fn" >> $htaccess.tmp +echo "Redirect /nixos/latest-ova-x86_64-linux $baseURL/$fn" >> $htaccess.tmp mv $htaccess.tmp $htaccess diff --git a/mirror-nixpkgs.sh b/mirror-nixpkgs.sh index 52ca7d5..5e9d142 100755 --- a/mirror-nixpkgs.sh +++ b/mirror-nixpkgs.sh @@ -48,8 +48,8 @@ rsync -avR . hydra-mirror@nixos.org:"$releasesDir" --delete >&2 # Update the channel. htaccess=$channelsDir/.htaccess-$channelName -echo "Redirect /channels/$channelName http://nixos.org/releases/nixpkgs/$release" > $htaccess.tmp -echo "Redirect /releases/nixpkgs/channels/$channelName http://nixos.org/releases/nixpkgs/$release" >> $htaccess.tmp # obsolete +echo "Redirect /channels/$channelName http://releases.nixos.org/nixpkgs/$release" > $htaccess.tmp +echo "Redirect /releases/nixpkgs/channels/$channelName http://releases.nixos.org/nixpkgs/$release" >> $htaccess.tmp # obsolete mv $htaccess.tmp $htaccess ln -sfn $releaseDir $channelsDir/$channelName # dummy symlink