From 5be819b1e0bf794a51de09ad6c5e9d83cc302178 Mon Sep 17 00:00:00 2001 From: LinuxSquare Date: Fri, 24 Nov 2023 18:05:52 +0100 Subject: [PATCH] Move util => apps, Add generate_motd --- apps/generate-motd.sls | 24 ++++++++++++++++++ apps/init.sls | 3 +++ .../files/noveriablcgen_config.json.jinja | 0 .../noveriablcgen/init.sls | 12 ++++----- system/bootloader.sls | 25 +++++++++++++++++++ system/candy.sls | 17 ------------- ...jinja => bootloader_00_noveria.motd.jinja} | 0 system/init.sls | 1 - top.sls | 2 +- util/init.sls | 2 -- 10 files changed, 59 insertions(+), 27 deletions(-) create mode 100644 apps/generate-motd.sls create mode 100644 apps/init.sls rename {util => apps/noveriablcgen}/files/noveriablcgen_config.json.jinja (100%) rename util/noveriablcgen.sls => apps/noveriablcgen/init.sls (82%) delete mode 100644 system/candy.sls rename system/files/{candy_motd.jinja => bootloader_00_noveria.motd.jinja} (100%) delete mode 100644 util/init.sls diff --git a/apps/generate-motd.sls b/apps/generate-motd.sls new file mode 100644 index 0000000..ca8c78b --- /dev/null +++ b/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 diff --git a/apps/init.sls b/apps/init.sls new file mode 100644 index 0000000..c89de02 --- /dev/null +++ b/apps/init.sls @@ -0,0 +1,3 @@ +include: + - .noveriablcgen + - .generate-motd diff --git a/util/files/noveriablcgen_config.json.jinja b/apps/noveriablcgen/files/noveriablcgen_config.json.jinja similarity index 100% rename from util/files/noveriablcgen_config.json.jinja rename to apps/noveriablcgen/files/noveriablcgen_config.json.jinja diff --git a/util/noveriablcgen.sls b/apps/noveriablcgen/init.sls similarity index 82% rename from util/noveriablcgen.sls rename to apps/noveriablcgen/init.sls index f80e766..2a1cf38 100644 --- a/util/noveriablcgen.sls +++ b/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 \ No newline at end of file + - apps_noveriablcgen_git diff --git a/system/bootloader.sls b/system/bootloader.sls index d4207ef..6a811b5 100644 --- a/system/bootloader.sls +++ b/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 diff --git a/system/candy.sls b/system/candy.sls deleted file mode 100644 index 59f119f..0000000 --- a/system/candy.sls +++ /dev/null @@ -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 \ No newline at end of file diff --git a/system/files/candy_motd.jinja b/system/files/bootloader_00_noveria.motd.jinja similarity index 100% rename from system/files/candy_motd.jinja rename to system/files/bootloader_00_noveria.motd.jinja diff --git a/system/init.sls b/system/init.sls index 0086569..ac26156 100644 --- a/system/init.sls +++ b/system/init.sls @@ -5,4 +5,3 @@ include: - .user - .shell - .salt - - .candy \ No newline at end of file diff --git a/top.sls b/top.sls index 0cd8112..d95dd76 100644 --- a/top.sls +++ b/top.sls @@ -2,7 +2,7 @@ base: '*': - system - network - - util + - apps - podman - mysql - openssh diff --git a/util/init.sls b/util/init.sls deleted file mode 100644 index 36a50e5..0000000 --- a/util/init.sls +++ /dev/null @@ -1,2 +0,0 @@ -include: - - .noveriablcgen \ No newline at end of file