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') 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') 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 d55553665cfab780dec0d3ad48ab98b80ac3aa9c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 19 Mar 2017 16:23:16 -0400 Subject: add news item for propellor 4.0.1 --- doc/news/version_4.0.0.mdwn | 30 ------------------------------ doc/news/version_4.0.1.mdwn | 6 ++++++ 2 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 doc/news/version_4.0.0.mdwn create mode 100644 doc/news/version_4.0.1.mdwn (limited to 'doc') diff --git a/doc/news/version_4.0.0.mdwn b/doc/news/version_4.0.0.mdwn deleted file mode 100644 index bb62b4a2..00000000 --- a/doc/news/version_4.0.0.mdwn +++ /dev/null @@ -1,30 +0,0 @@ -propellor 4.0.0 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Added Monoid instances for Property and RevertableProperty. - * Removed applyToList. Instead, use mconcat. (API change) - If you had: applyToList accountFor [User "joey", User "root"] - use instead: mconcat (map accountFor [User "joey", User "root"]) - * Makefile: Removed "run" target which was default target. - "make" now only builds propellor, does not run it. - Note that propellor 1.0.0 and earlier relied on this target for - the Cron.runPropellor property's cronjob to work, so upgrading - directly from 1.0.0 to 4.0.0 would break that cron job. - * Remove make from propellor's dependency list; it's not used by - propellor any longer. - * Implemented hostChroot, as originally seen in my slides at - Linux.Conf.Au 2017 in January. Now that it's not vaporware, it allows - one Host to build a disk image that has all the properties of another - Host. - * DiskImage building properties used to propagate DNS info out from - the chroot used to build the disk image to the Host. That is no longer - done, since that chroot only exists as a side effect of the disk image - creation and servers will not be running in it. - * The IsInfo types class's propagateInfo function changed to use a - PropagateInfo data type. (API change) - * The action used to satisfy a property changed to Maybe (Propellor Result). - When it is Nothing, propellor knows it can skip displaying the - description of that property. This is mostly useful in the - implementation of mempty. (API change) - * The doNothing property is now simply mempty. The name was retained - because it can be clearer than mempty in some contexts. - * Added Apache.confEnabled."""]] \ No newline at end of file diff --git a/doc/news/version_4.0.1.mdwn b/doc/news/version_4.0.1.mdwn new file mode 100644 index 00000000..e870a510 --- /dev/null +++ b/doc/news/version_4.0.1.mdwn @@ -0,0 +1,6 @@ +propellor 4.0.1 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Fix build with pre-AMP ghc. + * Tor: Restart daemon after installing private key. + * Tor.named, Tor.torPrivKey: Include the new ed25519 public/private key + pair in addition to the old secret\_id\_key."""]] \ No newline at end of file -- 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') 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') 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