Move util => apps, Add generate_motd

apps/generate-motd.sls

@@ -0,0 +1,24 @@
+include:
+  - system.base
+
+{% from "map.jinja" import noveria %}
+
+apps_generate-motd_git:
+  git.latest:
+    - name: https://git.noveria.org/Noveria/generate_motd.git
+    - target: {{ noveria.app_dir }}/generate_motd
+    - user: root
+    - force_reset: True
+    - require:
+      - system_base_apps_dir
+
+apps_generate-motd_link:
+  file.symlink:
+    - name: {{ noveria.bin_dir }}/generate_motd
+    - target: {{ noveria.app_dir }}/generate_motd/generate_motd
+    - user: root
+    - group: root
+    - mode: '0755'
+    - require:
+      - system_base_bin_dir
+      - apps_generate-motd_git

apps/init.sls

@@ -0,0 +1,3 @@
+include:
+  - .noveriablcgen
+  - .generate-motd

apps/noveriablcgen/init.sls

@@ -3,16 +3,16 @@ include:
 
 {% from "map.jinja" import noveria %}
 
-util_noveriablcgen_git:
+apps_noveriablcgen_git:
   git.latest:
-    - name: https://gitlab.com/noveria/tools/noveriablcgen.git
+    - name: https://git.noveria.org/Noveria/noveriablcgen.git
     - target: {{ noveria.app_dir }}/noveriablcgen
     - user: root
     - force_reset: True
     - require:
       - system_base_apps_dir
 
-util_noveriablcgen_link:
+apps_noveriablcgen_link:
   file.symlink:
     - name: {{ noveria.bin_dir }}/noveriablcgen
     - target: {{ noveria.app_dir }}/noveriablcgen/noveriablcgen
@@ -21,9 +21,9 @@ util_noveriablcgen_link:
     - mode: '0755'
     - require:
       - system_base_bin_dir
-      - util_noveriablcgen_git
+      - apps_noveriablcgen_git
 
-util_noveriablcgen_config:
+apps_noveriablcgen_config:
   file.managed:
     - name: {{ noveria.etc_dir }}/noveriablcgen/noveriablcgen.json
     - source: salt://{{ tpldir }}/files/noveriablcgen_config.json.jinja
@@ -39,4 +39,4 @@ util_noveriablcgen_config:
     - user: root
     - group: root
     - require:
-      - util_noveriablcgen_git
+      - apps_noveriablcgen_git

system/bootloader.sls

@@ -39,3 +39,28 @@ system_bootloader_os-release:
     - user: root
     - group: root
     - mode: '0644'
+
+system_bootloader_motd_dir:
+  file.directory:
+    - name: /etc/motd.d
+    - user: root
+    - group: root
+    - dir_mode: '0755'
+    - file_mode: '0644'
+    - require:
+      - system_bootloader_os-release
+
+system_bootloader_motd:
+  file.managed:
+    - name: /etc/motd.d/00_noveria.motd
+    - source: salt://{{ tpldir }}/files/bootloader_00_noveria.motd
+    - template: jinja
+    - context:
+        OS_NAME: {{ salt['cmd.shell']('grep -E ^PRETTY_NAME /etc/os-release | cut -d= -f2') }}
+        OS_RELEASE_INFO: {{ salt['cmd.shell']('grep -E ^RELEASE_INFO /etc/os-release | cut -d= -f2') }}
+        OS_ISSUE_URL: {{ salt['cmd.shell']('grep -E ^BUG_REPORT_URL /etc/os-release | cut -d= -f2') }}
+    - user: root
+    - group: root
+    - mode: '0644'
+    - require:
+      - system_bootloader_motd_dir

system/candy.sls

@@ -1,17 +0,0 @@
-include:
-  - .bootloader
-
-system_candy_motd:
-  file.managed:
-    - name: /etc/motd
-    - source: salt://{{ tpldir }}/files/candy_motd.jinja
-    - template: jinja
-    - context:
-        OS_NAME: {{ salt['cmd.shell']('grep -E ^PRETTY_NAME /etc/os-release | cut -d= -f2') }}
-        OS_RELEASE_INFO: {{ salt['cmd.shell']('grep -E ^RELEASE_INFO /etc/os-release | cut -d= -f2') }}
-        OS_ISSUE_URL: {{ salt['cmd.shell']('grep -E ^BUG_REPORT_URL /etc/os-release | cut -d= -f2') }}
-    - user: root
-    - group: root
-    - mode: '0644'
-    - require:
-      - system_bootloader_os-release

system/init.sls

@@ -5,4 +5,3 @@ include:
   - .user
   - .shell
   - .salt
-  - .candy

top.sls

@@ -2,7 +2,7 @@ base:
   '*':
     - system
     - network
-    - util
+    - apps
     - podman
     - mysql
     - openssh

util/init.sls

@@ -1,2 +0,0 @@
-include:
-  - .noveriablcgen