summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess2017-03-24 13:56:39 -0400
committerJoey Hess2017-03-24 13:56:39 -0400
commitb738aa54eed266d72669bcdafdbba7df6bc795fa (patch)
tree47131d1ba25122e0642ef8966bc977f2b980b62c /doc
parent5fc482fff3dcd9c809c275856adff1851b47160d (diff)
parent4d3a3caa6bd3ebea92bdcf3122922c881a4b2a3a (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'doc')
-rw-r--r--doc/news/version_4.0.0.mdwn30
-rw-r--r--doc/news/version_4.0.1.mdwn6
-rw-r--r--doc/todo/Info_property_to_select_host__39__s_preferred_Apt_mirror.mdwn4
-rw-r--r--doc/todo/Info_property_to_select_host__39__s_preferred_Apt_mirror/comment_2_2c2c4817a4259acbc1a63bac2e3fb2e3._comment8
-rw-r--r--doc/todo/bug_in_diskimage_finalization.mdwn11
5 files changed, 29 insertions, 30 deletions
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
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..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 +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/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.
+"""]]
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]]