summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-03-19 16:41:14 -0400
committerJoey Hess2017-03-19 16:41:14 -0400
commit49ab069466c1c042cad12ef9c74f1f03c65615a9 (patch)
tree1a3c436791914ae60e08989fa5df7cab4ce6745c
parent76071e5e5d73b8da345c66a25e3fe02e901df980 (diff)
Apt.mirror can be used to set the preferred apt mirror of a host, overriding the default CDN.
This info is used by Apt.stdSourcesList and Sbuild.builtFor. Thanks, Sean Whitton.
-rw-r--r--debian/changelog9
-rw-r--r--doc/todo/Info_property_to_select_host__39__s_preferred_Apt_mirror.mdwn2
-rw-r--r--src/Propellor/Property/Apt.hs5
3 files changed, 14 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index dd950ecb..ed0e2422 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+propellor (4.0.2) UNRELEASED; urgency=medium
+
+ * Apt.mirror can be used to set the preferred apt mirror of a host,
+ overriding the default CDN. This info is used by
+ Apt.stdSourcesList and Sbuild.builtFor.
+ Thanks, Sean Whitton.
+
+ -- Joey Hess <id@joeyh.name> Sun, 19 Mar 2017 16:37:27 -0400
+
propellor (4.0.1) unstable; urgency=medium
* Fix build with pre-AMP ghc.
diff --git a/doc/todo/Info_property_to_select_host__39__s_preferred_Apt_mirror.mdwn b/doc/todo/Info_property_to_select_host__39__s_preferred_Apt_mirror.mdwn
index e3702ab9..4cd76383 100644
--- a/doc/todo/Info_property_to_select_host__39__s_preferred_Apt_mirror.mdwn
+++ b/doc/todo/Info_property_to_select_host__39__s_preferred_Apt_mirror.mdwn
@@ -1,3 +1,5 @@
It would be good to have an info property, say `Apt.mirror`, which sets a host's preferred apt mirror. Then all properties in `Propellor.Property.Apt` would use this mirror when generating sources lists, falling back to the `deb.debian.org` default. The value of `Apt.mirror` could be an apt cache on the LAN, or a mirror that is known to be better than the Debian CDN from where the host is located. --[[spwhitton|user/spwhitton]]
[[!tag user/spwhitton]]
+
+> [[merged|done]] thank you! --[[Joey]]
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index 8f4678df..686ddb6c 100644
--- a/src/Propellor/Property/Apt.hs
+++ b/src/Propellor/Property/Apt.hs
@@ -105,8 +105,9 @@ securityUpdates suite
in [l, srcLine l]
| otherwise = []
--- | Makes sources.list have a standard content using the Debian mirror CDN,
--- with the Debian suite configured by the os.
+-- | Makes sources.list have a standard content using the Debian mirror CDN
+-- (or other host specified using the `mirror` property), with the
+-- Debian suite configured by the os.
stdSourcesList :: Property Debian
stdSourcesList = withOS "standard sources.list" $ \w o -> case o of
(Just (System (Debian _ suite) _)) ->