From bc149b0df5c157a7b270066f3b48ec110b4a8ea5 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Sun, 19 Mar 2017 18:26:42 +0000 Subject: take ownership of todo item --- doc/todo/Info_property_to_select_host__39__s_preferred_Apt_mirror.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/todo') 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 355d53b2..e3702ab9 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 +1,3 @@ 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]] -- cgit v1.3-2-g0d8e From a88df4a071b49a48e0ebf7770b6cdeb89da2c3c2 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Sun, 19 Mar 2017 18:42:20 +0000 Subject: Added a comment: merge request --- .../comment_2_2c2c4817a4259acbc1a63bac2e3fb2e3._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/todo/Info_property_to_select_host__39__s_preferred_Apt_mirror/comment_2_2c2c4817a4259acbc1a63bac2e3fb2e3._comment (limited to 'doc/todo') diff --git a/doc/todo/Info_property_to_select_host__39__s_preferred_Apt_mirror/comment_2_2c2c4817a4259acbc1a63bac2e3fb2e3._comment b/doc/todo/Info_property_to_select_host__39__s_preferred_Apt_mirror/comment_2_2c2c4817a4259acbc1a63bac2e3fb2e3._comment new file mode 100644 index 00000000..b79ba1c1 --- /dev/null +++ b/doc/todo/Info_property_to_select_host__39__s_preferred_Apt_mirror/comment_2_2c2c4817a4259acbc1a63bac2e3fb2e3._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="spwhitton" + avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb" + subject="merge request" + date="2017-03-19T18:42:20Z" + content=""" +Please see branch `apt-mirror` of repo `https://git.spwhitton.name/propellor` for an implementation of this. +"""]] -- cgit v1.3-2-g0d8e 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 'doc/todo') 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.3-2-g0d8e From 4d3a3caa6bd3ebea92bdcf3122922c881a4b2a3a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 24 Mar 2017 10:59:44 -0400 Subject: bug report --- doc/todo/bug_in_diskimage_finalization.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/todo/bug_in_diskimage_finalization.mdwn (limited to 'doc/todo') diff --git a/doc/todo/bug_in_diskimage_finalization.mdwn b/doc/todo/bug_in_diskimage_finalization.mdwn new file mode 100644 index 00000000..288e96f2 --- /dev/null +++ b/doc/todo/bug_in_diskimage_finalization.mdwn @@ -0,0 +1,11 @@ +DiskImage.imageBuilt has broken and no longer runs the finalization +properties that get added to the chroot. This includes installing grub, and +Chroot.noServices etc. + +Seems that the `_chroot` info that gets propigated from imageBuilt is +for the chroot before those properties are added to it. Then when chaining +into the chroot, `_chroot` info is examined to find the properties to +ensure. + +I have not yet been able to determine what broke it -- I'm sure it used to +work. --[[Joey]] -- cgit v1.3-2-g0d8e