From c8c08e774acc1466985a29cdfb941d72e62ac32a Mon Sep 17 00:00:00 2001 From: LinuxSquare <7436714-OfficialLinuxSquare@users.noreply.gitlab.com> Date: Fri, 29 Sep 2023 19:47:31 +0200 Subject: [PATCH] Add os-release, add motd --- system/base.sls | 27 ++++++++++++++++++++++++++- system/files/base_motd.jinja | 13 +++++++++++++ system/files/base_os-release.jinja | 7 +++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 system/files/base_motd.jinja create mode 100644 system/files/base_os-release.jinja diff --git a/system/base.sls b/system/base.sls index fb42062..c349918 100644 --- a/system/base.sls +++ b/system/base.sls @@ -24,4 +24,29 @@ system_base_apps_dir: - user: root - group: root - dir_mode: '0755' - - file_mode: '0644' \ No newline at end of file + - file_mode: '0644' + +system_base_os-release: + file.managed: + - name: /etc/os-release + - source: salt://{{ tpldir }}/files/base_os-release.jinja + - template: jinja + - context: + OS_VERSION: {{ salt['cmd.shell']('date "+%Y%m"') }} + - user: root + - group: root + - mode: '0644' + +system_base_motd: + file.managed: + - name: /etc/motd + - source: salt://{{ tpldir }}/files/base_motd.jinja + - template: jinja + - context: + OS: {{ salt['cmd.shell']('grep -E ^NAME /etc/os-release | cut -d= -f2 | sed \'s|"||g\'') }} + OS_VERSION: {{ salt['cmd.shell']('grep -E ^VERSION_ID /etc/os-release | cut -d= -f2 | sed \'s|"||g\'') }} + - user: root + - group: root + - mode: '0644' + - require: + - system_base_os-release \ No newline at end of file diff --git a/system/files/base_motd.jinja b/system/files/base_motd.jinja new file mode 100644 index 0000000..4082bb7 --- /dev/null +++ b/system/files/base_motd.jinja @@ -0,0 +1,13 @@ +╔═══════════════════════════════════════════════╗ +║ Velkommen til ║ +║ _ _ _ ║ +║ | \ | | (_) ║ +║ | \| | _____ _____ _ __ _ __ _ ║ +║ | . ` |/ _ \ \ / / _ \ '__| |/ _` | ║ +║ | |\ | (_) \ V / __/ | | | (_| | ║ +║ |_| \_|\___/ \_/ \___|_| |_|\__,_| ║ +║ ║ +╚═══════════════════════════════════════════════╝ + +OS: {{ OS }} +Version: {{ OS_VERSION }} diff --git a/system/files/base_os-release.jinja b/system/files/base_os-release.jinja new file mode 100644 index 0000000..a5d7c2e --- /dev/null +++ b/system/files/base_os-release.jinja @@ -0,0 +1,7 @@ +NAME="NoveriaOS" +ID=noveriaos +ID_LIKE=alpine +VERSION_ID="{{ OS_VERSION }}" +PRETTY_NAME="NoveriaOS {{ OS_VERSION }}" +HOME_URL="https://noveria.org" +BUG_REPORT_URL="https://git.noveria.org/NoveriaOS/iso/issues" \ No newline at end of file