From 4a22cba6a284381e1ffabba8fec4aa8949a3d956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Sun, 2 Jan 2022 03:16:44 +0100
Subject: Move paths.

---
 hiera.yaml                                 | 2 +-
 modules/nspawn/manifests/machine.pp        | 4 ++++
 modules/profiles/manifests/puppetserver.pp | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hiera.yaml b/hiera.yaml
index d50d97e..1bce073 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -12,6 +12,6 @@ hierarchy:
     path: os/%{facts.os.family}.yaml
   - name: Secrets
     path: data.yaml
-    datadir: /etc/secrets
+    datadir: /puppet
   - name: Common data
     path: common.yaml
diff --git a/modules/nspawn/manifests/machine.pp b/modules/nspawn/manifests/machine.pp
index 1c688f6..a16a82c 100644
--- a/modules/nspawn/manifests/machine.pp
+++ b/modules/nspawn/manifests/machine.pp
@@ -7,6 +7,10 @@ define nspawn::machine (
 
   require ::nspawn::setup
 
+  file { "/var/lib/machines/${machine}/puppet":
+    ensure => directory,
+  }
+
   file { "/etc/systemd/nspawn/${machine}.nspawn":
     content => @("EOF")
     [Exec]
diff --git a/modules/profiles/manifests/puppetserver.pp b/modules/profiles/manifests/puppetserver.pp
index f8fc47c..d438503 100644
--- a/modules/profiles/manifests/puppetserver.pp
+++ b/modules/profiles/manifests/puppetserver.pp
@@ -11,7 +11,7 @@ class profiles::puppetserver {
   inifile::create_ini_settings(
     { common   => { 
         node_fmt => yaml,
-        nodes    => '/nodes.yaml',
+        nodes    => '/puppet/nodes.yaml',
       },
     },
     { 
-- 
cgit v1.2.3