Move motd to candy-state, edit salt-minion config
This commit is contained in:
parent
35da420376
commit
5f432e16c9
6 changed files with 19 additions and 14 deletions
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
system/files/systemupdate.sh
|
|
@ -7,6 +7,7 @@ system_base_pkgs:
|
||||||
- jq
|
- jq
|
||||||
- vim
|
- vim
|
||||||
- git
|
- git
|
||||||
|
- findmnt
|
||||||
|
|
||||||
system_base_bin_dir:
|
system_base_bin_dir:
|
||||||
file.directory:
|
file.directory:
|
||||||
|
@ -36,16 +37,3 @@ system_base_os-release:
|
||||||
- user: root
|
- user: root
|
||||||
- group: root
|
- group: root
|
||||||
- mode: '0644'
|
- mode: '0644'
|
||||||
|
|
||||||
system_base_motd:
|
|
||||||
file.managed:
|
|
||||||
- name: /etc/motd
|
|
||||||
- source: salt://{{ tpldir }}/files/base_motd.jinja
|
|
||||||
- template: jinja
|
|
||||||
- context:
|
|
||||||
OS_NAME: {{ salt['cmd.shell']('grep -E ^PRETTY_NAME /etc/os-release | cut -d= -f2') }}
|
|
||||||
OS_VERSION: {{ salt['cmd.shell']('grep -E ^VERSION_ID /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'
|
|
12
system/candy.sls
Normal file
12
system/candy.sls
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
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_VERSION: {{ salt['cmd.shell']('grep -E ^VERSION_ID /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'
|
|
@ -1,7 +1,10 @@
|
||||||
---
|
---
|
||||||
|
state_verbose: False
|
||||||
file_client: local
|
file_client: local
|
||||||
file_roots:
|
file_roots:
|
||||||
base:
|
base:
|
||||||
- /srv/salt
|
- /srv/salt
|
||||||
state_verbose: false
|
pillar_roots:
|
||||||
|
base:
|
||||||
|
- /srv/pillar
|
||||||
...
|
...
|
||||||
|
|
|
@ -7,3 +7,4 @@ include:
|
||||||
- .user
|
- .user
|
||||||
- .shell
|
- .shell
|
||||||
- .salt
|
- .salt
|
||||||
|
- .candy
|
Loading…
Reference in a new issue