saltstack-formulas/prometheus-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #71 from mdschmitt/use_nologin_shell

Browse Source 
fix(defaults): Use nologin instead of /bin/false
This commit is contained in:
N 2021-08-06 11:00:29 +01:00 committed by GitHub
commit bc5713d29e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prometheus/config/users.sls
View File

@ -18,7 +18,7 @@ prometheus-config-users-install-{{ name }}-user-present:
- groups: - groups:
- {{ name }} - {{ name }}
{%- if grains.os != 'Windows' %} {%- if grains.os != 'Windows' %}
- shell: /bin/false - shell: {{ p.shell }}
{%- if grains.kernel|lower == 'linux' %} {%- if grains.kernel|lower == 'linux' %}
- createhome: false - createhome: false
{%- if grains.get('osfinger', '') in ['Debian-11'] %} {%- if grains.get('osfinger', '') in ['Debian-11'] %}

2
prometheus/defaults.yaml
View File

@ -310,6 +310,8 @@ prometheus:
rootuser: root rootuser: root
rootgroup: root rootgroup: root
shell: /usr/sbin/nologin
retry_option: retry_option:
# https://docs.saltstack.com/en/latest/ref/states/requisites.html#retrying-states # https://docs.saltstack.com/en/latest/ref/states/requisites.html#retrying-states
attempts: 3 attempts: 3

1
prometheus/osfamilymap.yaml
View File

@ -406,6 +406,7 @@ Windows:
MacOS: MacOS:
div: '/' div: '/'
shell: /sbin/nologin
dir: dir:
default: /etc/defaults default: /etc/defaults
identity: identity: