Merge remote-tracking branch 'remotes/misandrist/FreeBSD' into wip

10 files changed, 58 insertions, 97 deletions

diff --git a/doc/news/version_2.10.0.mdwn b/doc/news/version_2.10.0.mdwn
deleted file mode 100644
index 67d08c88..00000000
--- a/doc/news/version_2.10.0.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-propellor 2.10.0 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * The Propellor.Property.Spin added in the last release is replaced
-     with a very different Propellor.Property.ControlHeir."""]]
\ No newline at end of file
diff --git a/doc/news/version_2.12.0.mdwn b/doc/news/version_2.12.0.mdwn
deleted file mode 100644
index 58a7193c..00000000
--- a/doc/news/version_2.12.0.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-propellor 2.12.0 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * The DiskImage module can now make bootable images using grub.
-   * Add a ChrootTarball chroot type, for using pre-built tarballs
-     as chroots. Thanks, Ben Boeckel.
-   * HostName: Improve domain extraction code.
-   * Added Mount.fstabbed property to generate /etc/fstab to replicate
-     current mounts.
-   * HostName: Improve domain extraction code.
-   * Add File.basedOn. Thanks, Per Olofsson.
-   * Changed how the operating system is provided to Chroot (API change).
-     Where before debootstrapped and bootstrapped took a System parameter,
-     the os property should now be added to the Chroot.
-   * Follow-on change to Systemd.container, which now takes a System parameter.
-   * Generalized Property.check so it can be used with Propellor actions as
-     well as IO actions.
-   * Hostname.sane and Hostname.setTo can now safely be used as a property
-     of a chroot, and won't affect the hostname of the host system."""]]
\ No newline at end of file
diff --git a/doc/news/version_2.13.0.mdwn b/doc/news/version_2.13.0.mdwn
deleted file mode 100644
index c3cb8828..00000000
--- a/doc/news/version_2.13.0.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-propellor 2.13.0 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * RevertableProperty used to be assumed to contain info, but this is
-     now made explicit, with RevertableProperty HasInfo or
-     RevertableProperty NoInfo. (API change)
-     Transition guide:
-       - If you define a RevertableProperty, expect some type check
-         failures like: "Expecting one more argument to ‘RevertableProperty’".
-       - Change it to "RevertableProperty NoInfo"
-       - The compiler will then tell you if it needs "HasInfo" instead.
-       - If you have code that uses the RevertableProperty constructor
-         that fails to type check, use the more powerful <!> operator
-         instead to create the RevertableProperty.
-   * Various property combinators that combined a RevertableProperty
-     with a non-revertable property used to yield a RevertableProperty.
-     This was a bug, because the combined property could not be fully
-     reverted in many cases, and the result is now a non-revertable property.
-   * combineWith now takes an additional parameter to control how revert
-     actions are combined (API change).
-   * Added Propellor.Property.Concurrent for concurrent properties.
-   * Made the execProcess exported by propellor, and everything built on it,
-     avoid scrambled output when run concurrently.
-   * Propellor now depends on STM and text.
-   * The cabal file now builds propellor with -O. While -O0 makes ghc
-     take less memory while building propellor, it can lead to bad memory
-     usage at runtime due to eg, disabled stream fusion.
-   * Add File.isCopyOf. Thanks, Per Olofsson."""]]
\ No newline at end of file
diff --git a/doc/news/version_2.15.1.mdwn b/doc/news/version_2.15.1.mdwn
new file mode 100644
index 00000000..ea750b6a
--- /dev/null
+++ b/doc/news/version_2.15.1.mdwn
@@ -0,0 +1,11 @@
+propellor 2.15.1 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Added git configs propellor.spin-branch and propellor.forbid-dirty-spin.
+     Thanks, Sean Whitton.
+   * Added User.systemAccountFor and User.systemAccountFor' properties.
+     Thanks, Félix Sipma.
+   * Gpg.keyImported converted to not use a flag file and instead check
+     if gpg has the provided key already.
+     Thanks, Félix Sipma.
+   * Merged Utility changes from git-annex.
+   * Clean build with ghc 7.10."""]]
\ No newline at end of file
diff --git a/doc/news/version_2.15.2.mdwn b/doc/news/version_2.15.2.mdwn
new file mode 100644
index 00000000..b1a3bf80
--- /dev/null
+++ b/doc/news/version_2.15.2.mdwn
@@ -0,0 +1,9 @@
+propellor 2.15.2 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Added GNUPGBIN environment variable or git.program git config
+     to control the command run for gpg. Allows eg, GNUPGBIN=gpg2
+     Thanks, Félix Sipma.
+   * Bootstrap apt-get installs run with deconf noninteractive frontend.
+   * spin --via: Avoid committing on relay host.
+   * Postfix: Add service property to enable/disable services in master.cf.
+   * Added Munin module, contributed by Jelmer Vernooij."""]]
\ No newline at end of file
diff --git a/doc/news/version_2.15.3.mdwn b/doc/news/version_2.15.3.mdwn
new file mode 100644
index 00000000..a8a2a53e
--- /dev/null
+++ b/doc/news/version_2.15.3.mdwn
@@ -0,0 +1,5 @@
+propellor 2.15.3 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Added Git.bareRepoDefaultBranch property
+     Thanks, Sean Whitton.
+   * Add missing Control.Applicative imports needed by older versions of ghc."""]]
\ No newline at end of file
diff --git a/doc/news/version_2.15.4.mdwn b/doc/news/version_2.15.4.mdwn
new file mode 100644
index 00000000..4e20bcc9
--- /dev/null
+++ b/doc/news/version_2.15.4.mdwn
@@ -0,0 +1,15 @@
+propellor 2.15.4 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Build /usr/src/propellor/propellor.git reproducibly,
+     which makes the whole Debian package build reproducibly.
+     Thanks, Sean Whitton.
+   * Obnam: To cause old generations to be forgotten, keepParam can be
+     passed to a backup property; this causes obnam forget to be run.
+   * Delete /etc/apt/apt.conf.d/50unattended-upgrades.ucf-dist when
+     unattended-upgrades is installed, to work around #812380 which results
+     in many warnings from apt, including in cron mails.
+   * Added Propellor.Property.LetsEncrypt
+   * Apache.httpsVirtualHost: New property, setting up a https vhost
+     with the certificate automatically obtained using letsencrypt.
+   * Allow using combineProperties and propertyList with lists of
+     RevertableProperty."""]]
\ No newline at end of file
diff --git a/doc/news/version_2.16.0.mdwn b/doc/news/version_2.16.0.mdwn
new file mode 100644
index 00000000..b7527f05
--- /dev/null
+++ b/doc/news/version_2.16.0.mdwn
@@ -0,0 +1,18 @@
+propellor 2.16.0 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Obnam: Only let one backup job run at a time when a host has multiple
+     different backup properties, to avoid concurrent jobs fighting over
+     scarce resources (particularly memory). Other jobs block on a lock
+     file.
+   * Removed references to a Debian derivative from code and documentation
+     because of an unfortunate trademark use policy.
+     http://joeyh.name/blog/entry/trademark\_nonsense/
+   * That included changing a data constructor to "Buntish", an API change.
+   * Firewall.rule: Now takes a Table parameter. (API change)
+   * Firewall: add InIFace/OutIFace Rules, add Source/Destination Rules,
+     add CustomTarget, and more improvements.
+     Thanks, Félix Sipma.
+   * Ssh.authorizedKey: Fix bug preventing it from working when the
+     authorized\_keys file does not yet exist.
+   * Removed Ssh.unauthorizedKey and made Ssh.authorizedKey revertable.
+     (API change)"""]]
\ No newline at end of file
diff --git a/doc/news/version_2.8.1.mdwn b/doc/news/version_2.8.1.mdwn
deleted file mode 100644
index fafde5e4..00000000
--- a/doc/news/version_2.8.1.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-propellor 2.8.1 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Guard against power loss etc when building propellor, by updating
-     the executable atomically.
-   * Added Logcheck module, contributed by Jelmer Vernooij.
-   * Added Kerberos module, contributed by Jelmer Vernooij.
-   * Privdata that uses HostContext inside a container will now have the
-     name of the container as its context, rather than the name of
-     the host(s) where the container is used. This allows eg, having different
-     passwords for a user in different containers. Note that previously,
-     propellor would prompt using the container name as the context, but
-     not actually use privdata using that context; so this is a bug fix.
-   * Fix --add-key to not fail committing when no privdata file exists yet."""]]
\ No newline at end of file
diff --git a/doc/news/version_2.9.0.mdwn b/doc/news/version_2.9.0.mdwn
deleted file mode 100644
index ef445452..00000000
--- a/doc/news/version_2.9.0.mdwn
+++ /dev/null
@@ -1,35 +0,0 @@
-propellor 2.9.0 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Added basic Uwsgi module, maintained by Félix Sipma.
-   * Add Apt.hasForeignArch. Thanks, Per Olofsson.
-   * Improved documentation, particularly of the Propellor module.
-   * The Propellor module no longer exports many of the things it used to,
-     being now focused on only what's needed to write config.hs.
-     Use Propellor.Base to get all the things exported by Propellor before.
-     (API change)
-   * Some renaming of instance methods, and moving of functions to more
-     appropriate modules. (API change)
-   * Added File.isSymlinkedTo. Thanks, Per Olofsson.
-   * fileProperty, and properties derived from it now write the new
-     file content via origfile.propellor-new~, instead of to a randomly named
-     temp file. This allows them to clean up any temp file that may have
-     been left by an interrupted run of propellor.
-   * Added Propellor.Property.Spin, which can be used to make a host be a
-     controller of other hosts, which will automatically spin them each time
-     propellor is run.
-   * Ssh.keyImported is replaced with Ssh.userKeys. (API change)
-     The new property only gets the private key from the privdata; the
-     public key is provided as a parameter, and so is available as
-     Info that other properties can use.
-   * Ssh.keyImported' is renamed to Ssh.userKeyAt, and also changed
-     to only import the private key from the privdata. (API change)
-   * While Ssh.keyImported and Ssh.keyImported' avoided updating existing
-     keys, the new Ssh.userKeys and Ssh.userKeyAt properties will
-     always update out of date key files.
-   * Ssh.pubKey renamed to Ssh.hostPubKey. (API change)
-   * Added --unset-unused
-   * Fix typo: propigate → propagate. Thanks, Felix Gruber.
-     (A minor API change)
-   * Chroot: Converted to use a ChrootBootstrapper type class, so
-     other ways to bootstrap chroots can easily be added in separate
-     modules. (API change)"""]]
\ No newline at end of file