summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-04-21 12:52:22 -0400
committerJoey Hess2015-04-21 12:52:22 -0400
commit0fc926934a8e5c736219d0a53790de2fd1e2b87c (patch)
treef4fefca582144dbbc752409659f6f09e875107fa
parent9a18f580876c2a4c92be4004d8fce187f896c7aa (diff)
parent07be883258e51bc797c354195e261f76b1544a17 (diff)
Merge branch 'joeyconfig'
-rw-r--r--debian/changelog2
-rw-r--r--src/Propellor/Property/Apt.hs2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 89c63c12..95e3805d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ propellor (2.2.2) UNRELEASED; urgency=medium
* Note that since a new switch had to be added to allow testing the binary,
upgrading to this version will cause a rebuild from scratch of propellor.
* Added hasLoginShell and shellEnabled.
+ * debCdn changed to new httpredir.debian.org official replacement for
+ http.debian.net.
-- Joey Hess <id@joeyh.name> Thu, 02 Apr 2015 10:09:46 -0400
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index 75c59772..7f2ed795 100644
--- a/src/Propellor/Property/Apt.hs
+++ b/src/Propellor/Property/Apt.hs
@@ -61,7 +61,7 @@ binandsrc url suite = catMaybes
return $ debLine bs url stdSections
debCdn :: SourcesGenerator
-debCdn = binandsrc "http://http.debian.net/debian"
+debCdn = binandsrc "http://httpredir.debian.org/debian"
kernelOrg :: SourcesGenerator
kernelOrg = binandsrc "http://mirrors.kernel.org/debian"