Fix: hydra: deploy: fix puppet/devices ownership

diff --git a/docs/changelog.md b/docs/changelog.md
index 859518c87f1e542c8c9fd75d299b5458829f74a3..155459b3e9281e03d7884251b2eb5af199e72875 100644 (file)
--- 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 2a0a3f065a64eb6339873dc3eec5a003e377f984..48cbf9405d980d72ce857c040f0a87e41f653809 100644 (file)
--- 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 e440ae54164992ec496587a5540b6ed00ec77405..5fabb6c75dd0c787f4a2642790f774cde7444d90 100755 (executable)
--- 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 || \