diff --git a/system/base.sls b/system/base.sls index 5351005..a4e2752 100644 --- a/system/base.sls +++ b/system/base.sls @@ -25,33 +25,3 @@ system_base_apps_dir: - group: root - dir_mode: '0755' - file_mode: '0644' - -{% set OS_VERSION_DATE = salt['cmd.shell']('date "+%Y%m"') %} - -system_base_os-release: - file.managed: - - name: /etc/os-release - - source: salt://{{ tpldir }}/files/base_os-release.jinja - - template: jinja - - context: - OS_VERSION: {{ OS_VERSION_DATE }} - - user: root - - group: root - - mode: '0644' - -{% set OS_NAME = salt['cmd.shell']('grep -E ^NAME /etc/os-release | cut -d= -f2 | sed \'s|"||g\'') %} -{% set OS_VERSION_ID = salt['cmd.shell']('grep -E ^VERSION_ID /etc/os-release | cut -d= -f2 | sed \'s|"||g\'') %} - -system_base_motd: - file.managed: - - name: /etc/motd - - source: salt://{{ tpldir }}/files/base_motd.jinja - - template: jinja - - context: - OS: {{ OS_NAME }} - OS_VERSION: {{ OS_VERSION_ID }} - - user: root - - group: root - - mode: '0644' - - require: - - system_base_os-release