From fed18bc60db2f262363cb4b802bb11ea6d881621 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 Mar 2017 23:51:09 -0400 Subject: Tor: Restart daemon after installing private key. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9c9b793f..dfebc850 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -propellor (4.0.1) UNRELEASED; urgency=medium +propellor (4.0.1) unstable; urgency=medium * Fix build with pre-AMP ghc. + * Tor: Restart daemon after installing private key. - -- Joey Hess Sat, 18 Mar 2017 19:40:35 -0400 + -- Joey Hess Sat, 18 Mar 2017 20:19:41 -0400 propellor (4.0.0) unstable; urgency=medium -- cgit v1.2.3 From 52df6c10a662a3d4a3412178cfb069b663878d8f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 19 Mar 2017 16:21:45 -0400 Subject: releasing package propellor version 4.0.1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0a2b0e99..dd950ecb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ propellor (4.0.1) unstable; urgency=medium * Tor.named, Tor.torPrivKey: Include the new ed25519 public/private key pair in addition to the old secret_id_key. - -- Joey Hess Sat, 18 Mar 2017 20:19:41 -0400 + -- Joey Hess Sun, 19 Mar 2017 16:18:11 -0400 propellor (4.0.0) unstable; urgency=medium -- cgit v1.2.3 From 49ab069466c1c042cad12ef9c74f1f03c65615a9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 19 Mar 2017 16:41:14 -0400 Subject: 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. --- debian/changelog | 9 +++++++++ ...Info_property_to_select_host__39__s_preferred_Apt_mirror.mdwn | 2 ++ src/Propellor/Property/Apt.hs | 5 +++-- 3 files changed, 14 insertions(+), 2 deletions(-) (limited to 'debian') 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 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) _)) -> -- cgit v1.2.3