From 921c21633621b9d31ac5aba863259dd64f054541 Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Mon, 29 Jan 2024 16:51:15 +0100
Subject: [PATCH] Merge pull request #435 from flyingcircusio/changelog-2.4.1

Update Changelog and Docs for 2.4.1
---
 CHANGES.md               | 27 +++++++++++++++++++++++++--
 doc/source/cli/index.txt | 16 ++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e64aac3ba..328dea089 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,8 +4,31 @@
 ## 2.4.1 (unreleased)
 ---------------------
 
-- Nothing changed yet.
-
+- Deploying an environment without any hosts now gives a more
+  helpful error message. (#414)
+- In october 2023 readthedocs.org disabled building projects
+  using the web-configuration. This release adds a configuration
+  file to enable building batou's documentation again. (#415, #422)
+- `batou.utils.Address`` now handles getaddrinfo errors more gracefully.
+  (#416)
+- batou.lib.git.Clone now handles unquoting of filenames in git status
+  output correctly. (#418)
+- Errors thrown during attribute expansion are now explicitly
+  handled and report the attribute name. (#419)
+- Adds a `batou secrets reencrypt [--environments ENVIRONMENTS]`
+  command to re-encrypt secrets files. This is useful if you
+  want to re-fetch public keys from a keyserver. (#421)
+- Improved behaviour of `batou secrets add` and `batou secrets remove`
+  for age encrypted secrets (#421)
+- If a component fails to load, the error message now includes
+  a traceback. (#426)
+- Exposes `verify_opts` and `sync_opts` in `batou.lib.file.Directory`
+  to allow passing options to the underlying `rsync` call. The arguments
+  are passed via a `batou.lib.file.SyncDirectory` component.
+  (#427)
+- Sending a git repository via `git bundle` now fails correctly if
+  the bundle command fails. (#430)
+- Clarify `ensure_path_nonexistent` behaviour and documentation on race conditions. (#429)
 
 ## 2.4 (2023-12-06)
 ----------------------
diff --git a/doc/source/cli/index.txt b/doc/source/cli/index.txt
index 9e5c6531a..971a3b782 100644
--- a/doc/source/cli/index.txt
+++ b/doc/source/cli/index.txt
@@ -135,3 +135,19 @@ batou secrets remove
       --environments ENVIRONMENTS
                             The environments to update. Update all if not
                             specified.
+
+batou secrets reencrypt
+-----------------------
+
+Re-encrypt all secrets with the current set of keys. This is useful when
+you want to update the set of public keys fetched from a key server.
+
+.. code-block:: console
+
+    usage: batou secrets reencrypt [-h] [--environments ENVIRONMENTS]
+
+    optional arguments:
+      -h, --help            show this help message and exit
+      --environments ENVIRONMENTS
+                            The environments to update. Update all if not
+                            specified.