From 5e0784e2f5b474bfe3b8c6780105a6ae01ed37fe Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 9 Aug 2024 11:56:25 -0300
Subject: Fix: hydra: deploy: fix puppet/devices ownership

---
 docs/changelog.md  | 13 ++++++++-----
 docs/todo.md       |  2 --
 share/hydra/deploy |  3 +++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/docs/changelog.md b/docs/changelog.md
index 859518c..155459b 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -4,12 +4,15 @@
 
 ### hydra
 
+* [x] Deploy:
+    * [x] Automatically fix permission of (or delete) puppet's `devices`
+          folder: https://github.com/puppetlabs/puppet-specifications/blob/master/file_paths.md
 * [x] Keys:
-  * [x] Deprecate generating and deploying/import borg keys, since
-        pre-generation is not a supported behavior right now:
-        https://github.com/borgbackup/borg/issues/7047
-  * [x] Document about how keys are encrypted and backed up in the server:
-        https://borgbackup.readthedocs.io/en/latest/faq.html#how-important-is-the-home-config-borg-directory
+    * [x] Deprecate generating and deploying/import borg keys, since
+          pre-generation is not a supported behavior right now:
+          https://github.com/borgbackup/borg/issues/7047
+    * [x] Document about how keys are encrypted and backed up in the server:
+          https://borgbackup.readthedocs.io/en/latest/faq.html#how-important-is-the-home-config-borg-directory
 
 ### hydractl
 
diff --git a/docs/todo.md b/docs/todo.md
index 2a0a3f0..48cbf94 100644
--- a/docs/todo.md
+++ b/docs/todo.md
@@ -8,8 +8,6 @@
           Store somewhere under the `config/hardware` folder?
     * [ ] Command line is broken for ansible when multiple nodes are provided.
     * [ ] Use console-based GnuPG agent when calling `keyringer`.
-    * [ ] Automatically fix permission of (or delete) puppet's `devices`
-          folder: https://github.com/puppetlabs/puppet-specifications/blob/master/file_paths.md
 * [ ] Mass:
     * [ ] Support for [cumin][] ([Debian package](https://tracker.debian.org/pkg/cumin)).
 
diff --git a/share/hydra/deploy b/share/hydra/deploy
index e440ae5..5fabb6c 100755
--- a/share/hydra/deploy
+++ b/share/hydra/deploy
@@ -151,6 +151,9 @@ for node in $NODES; do
     # Fix ssl folder ownership
     $SUDO chown -R `whoami`: $HYDRA_FOLDER/puppet/ssl
 
+    # Fix devices folder ownership
+    $SUDO chown -R `whoami`: $HYDRA_FOLDER/puppet/devices
+
     # Import keys if needed
     if ! $SUDO test -f /root/.ssh/id_rsa     || \
        ! $SUDO test -f /root/.config/borg/hydra/key || \
-- 
cgit v1.2.3