summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog9
-rw-r--r--src/Propellor/Property/Apt.hs12
-rw-r--r--src/Propellor/Property/DebianMirror.hs2
-rw-r--r--src/Propellor/Property/Sbuild.hs2
4 files changed, 14 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 7a2fe693..ef67c673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+propellor (3.3.1) UNRELEASED; urgency=medium
+
+ * Apt: Removed the mirrors.kernel.org line from stdSourcesList etc.
+ The mirror CDN has a new implementation that should avoid the problems
+ with httpredir that made an extra mirror sometimes be needed.
+ * Switch Debian CDN address to deb.debian.org.
+
+ -- Joey Hess <id@joeyh.name> Mon, 13 Feb 2017 12:23:42 -0400
+
propellor (3.3.0) unstable; urgency=medium
* Arch Linux is now supported by Propellor!
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index 724f6d05..9a55c367 100644
--- a/src/Propellor/Property/Apt.hs
+++ b/src/Propellor/Property/Apt.hs
@@ -62,10 +62,7 @@ binandsrc url suite = catMaybes
return $ debLine bs url stdSections
debCdn :: SourcesGenerator
-debCdn = binandsrc "http://httpredir.debian.org/debian"
-
-kernelOrg :: SourcesGenerator
-kernelOrg = binandsrc "http://mirrors.kernel.org/debian"
+debCdn = binandsrc "http://deb.debian.org/debian"
-- | Only available for Stable and Testing
securityUpdates :: SourcesGenerator
@@ -77,9 +74,6 @@ securityUpdates suite
-- | Makes sources.list have a standard content using the Debian mirror CDN,
-- with the Debian suite configured by the os.
---
--- Since the CDN is sometimes unreliable, also adds backup lines using
--- kernel.org.
stdSourcesList :: Property Debian
stdSourcesList = withOS "standard sources.list" $ \w o -> case o of
(Just (System (Debian _ suite) _)) ->
@@ -98,7 +92,7 @@ stdSourcesList' suite more = tightenTargets $ setSourcesList
(concatMap (\gen -> gen suite) generators)
`describe` ("standard sources.list for " ++ show suite)
where
- generators = [debCdn, kernelOrg, securityUpdates] ++ more
+ generators = [debCdn, securityUpdates] ++ more
type PinPriority = Int
@@ -142,7 +136,7 @@ suiteAvailablePinned s pin = available <!> unavailable
| "-backports" `isSuffixOf` (showSuite s) = id
| otherwise = filter (not . isInfixOf "-backports")
- generators = [debCdn, kernelOrg, securityUpdates]
+ generators = [debCdn, securityUpdates]
prefFile = "/etc/apt/preferences.d/20" ++ showSuite s ++ ".pref"
sourcesFile = "/etc/apt/sources.list.d/" ++ showSuite s ++ ".list"
diff --git a/src/Propellor/Property/DebianMirror.hs b/src/Propellor/Property/DebianMirror.hs
index d8a9c423..ad15f9a2 100644
--- a/src/Propellor/Property/DebianMirror.hs
+++ b/src/Propellor/Property/DebianMirror.hs
@@ -79,7 +79,7 @@ data DebianMirror = DebianMirror
mkDebianMirror :: FilePath -> Cron.Times -> DebianMirror
mkDebianMirror dir crontimes = DebianMirror
- { _debianMirrorHostName = "httpredir.debian.org"
+ { _debianMirrorHostName = "deb.debian.org"
, _debianMirrorDir = dir
, _debianMirrorSuites = []
, _debianMirrorArchitectures = []
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs
index c3e55bbf..db5982cd 100644
--- a/src/Propellor/Property/Sbuild.hs
+++ b/src/Propellor/Property/Sbuild.hs
@@ -501,7 +501,7 @@ schrootFromSystem system@(System _ arch) =
>>= \suite -> return $ SbuildSchroot suite arch
stdMirror :: System -> Maybe Apt.Url
-stdMirror (System (Debian _ _) _) = Just "http://httpredir.debian.org/debian"
+stdMirror (System (Debian _ _) _) = Just "http://deb.debian.org/debian"
stdMirror (System (Buntish _) _) = Just "mirror://mirrors.ubuntu.com/"
stdMirror _ = Nothing