From 8d5bc2f8f27109732fdca97cd9257b90afd9d1b3 Mon Sep 17 00:00:00 2001
From: LinuxSquare <7436714-OfficialLinuxSquare@users.noreply.gitlab.com>
Date: Fri, 20 Oct 2023 15:08:22 +0200
Subject: [PATCH] Move create /usr/local/noveria/etc, move noveriablcgen.json
 to noveria/etc

---
 map.jinja              | 3 ++-
 util/noveriablcgen.sls | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/map.jinja b/map.jinja
index ebf5e4e..170841e 100644
--- a/map.jinja
+++ b/map.jinja
@@ -1,4 +1,5 @@
 {% set noveria = {
   'bin_dir': '/usr/local/noveria/bin',
-  'app_dir': '/usr/local/noveria/apps'
+  'app_dir': '/usr/local/noveria/apps',
+  'etc_dir': '/usr/local/noveria/etc'
 } %}
\ No newline at end of file
diff --git a/util/noveriablcgen.sls b/util/noveriablcgen.sls
index f3e9987..f80e766 100644
--- a/util/noveriablcgen.sls
+++ b/util/noveriablcgen.sls
@@ -25,7 +25,7 @@ util_noveriablcgen_link:
 
 util_noveriablcgen_config:
   file.managed:
-    - name: {{ noveria.app_dir }}/noveriablcgen/noveriablcgen.json
+    - name: {{ noveria.etc_dir }}/noveriablcgen/noveriablcgen.json
     - source: salt://{{ tpldir }}/files/noveriablcgen_config.json.jinja
     - template: jinja
     - context:
@@ -35,6 +35,7 @@ util_noveriablcgen_config:
         ROOT_UUID: {{ salt['cmd.shell']('lsblk -o LABEL,UUID | grep ROOT | awk \'{print $2}\'') }}
         GRUB_CONFIG: "/boot/grub/grub.cfg"
     - mode: '0644'
+    - makedirs: true
     - user: root
     - group: root
     - require: