fix(user/group): fixing user and group limitations from Arch

This commit is contained in:
Corey Hammerton 2022-09-07 14:46:14 -04:00
parent 2f52af7e18
commit ada3aa3f06
6 changed files with 16 additions and 16 deletions

View File

@ -98,8 +98,8 @@ prometheus-archive-install-{{ name }}-file-directory:
- name: {{ p.dir.var }}{{ p.div }}{{ name }} - name: {{ p.dir.var }}{{ p.div }}{{ name }}
- makedirs: True - makedirs: True
{%- if grains.os != 'Windows' %} {%- if grains.os != 'Windows' %}
- user: {{ name|truncate(32) }} - user: {{ name|truncate(32, False, "") }}
- group: {{ name|truncate(32) }} - group: {{ name|truncate(16, False, "") }}
- mode: '0755' - mode: '0755'
- require: - require:
- user: prometheus-config-users-install-{{ name }}-user-present - user: prometheus-config-users-install-{{ name }}-user-present
@ -123,8 +123,8 @@ prometheus-archive-install-{{ name }}-managed-service:
- context: - context:
desc: prometheus - {{ name }} service desc: prometheus - {{ name }} service
name: {{ name }} name: {{ name }}
user: {{ name|truncate(32) }} user: {{ name|truncate(32, False, "") }}
group: {{ name|truncate(32) }} group: {{ name|truncate(16, False, "") }}
env: {{ p.pkg.component[name]['service'].get('env', [])|tojson }} env: {{ p.pkg.component[name]['service'].get('env', [])|tojson }}
workdir: {{ p.dir.var }}/{{ name }} workdir: {{ p.dir.var }}/{{ name }}
stop: '' stop: ''

View File

@ -19,12 +19,12 @@ prometheus-config-clean-{{ name }}:
- name: {{ name }}_environ - name: {{ name }}_environ
{%- endif %} {%- endif %}
user.absent: user.absent:
- name: {{ name|truncate(32) }} - name: {{ name|truncate(32, False, "") }}
{%- if grains.os_family == 'MacOS' %} {%- if grains.os_family == 'MacOS' %}
- onlyif: /usr/bin/dscl . list /Users | grep {{ name }} >/dev/null 2>&1 - onlyif: /usr/bin/dscl . list /Users | grep {{ name }} >/dev/null 2>&1
{%- endif %} {%- endif %}
group.absent: group.absent:
- name: {{ name|truncate(32) }} - name: {{ name|truncate(16, False, "") }}
- require: - require:
- {{ sls_config_clean }} - {{ sls_config_clean }}

View File

@ -8,16 +8,16 @@
prometheus-config-users-install-{{ name }}-group-present: prometheus-config-users-install-{{ name }}-group-present:
group.present: group.present:
- name: {{ name|truncate(32) }} - name: {{ name|truncate(16, False, "") }}
- system: true - system: true
- require_in: - require_in:
- user: prometheus-config-users-install-{{ name }}-user-present - user: prometheus-config-users-install-{{ name }}-user-present
prometheus-config-users-install-{{ name }}-user-present: prometheus-config-users-install-{{ name }}-user-present:
user.present: user.present:
- name: {{ name|truncate(32) }} - name: {{ name|truncate(32, False, "") }}
- groups: - groups:
- {{ name|truncate(32) }} - {{ name|truncate(16, False, "") }}
{%- if grains.os != 'Windows' %} {%- if grains.os != 'Windows' %}
- shell: {{ p.shell }} - shell: {{ p.shell }}
{%- if grains.kernel|lower == 'linux' %} {%- if grains.kernel|lower == 'linux' %}

View File

@ -18,8 +18,8 @@ prometheus-exporters-{{ name }}-collector-textfile-dir:
- name: {{ p.pkg.component[name]['service']['args']['collector.textfile.directory'] }} - name: {{ p.pkg.component[name]['service']['args']['collector.textfile.directory'] }}
{%- if grains.os != 'Windows' %} {%- if grains.os != 'Windows' %}
- mode: 755 - mode: 755
- user: {{ name|truncate(32) }} - user: {{ name|truncate(32, False, "") }}
- group: {{ name|truncate(32) }} - group: {{ name|truncate(16, False, "") }}
{%- endif %} {%- endif %}
- makedirs: True - makedirs: True
- require: - require:

View File

@ -25,8 +25,8 @@ include:
prometheus-service-args-{{ name }}-data-dir: prometheus-service-args-{{ name }}-data-dir:
file.directory: file.directory:
- name: {{ args['storage.tsdb.path'] }} - name: {{ args['storage.tsdb.path'] }}
- user: {{ name|truncate(32) }} - user: {{ name|truncate(32, False, "") }}
- group: {{ name|truncate(32) }} - group: {{ name|truncate(16, False, "") }}
- makedirs: True - makedirs: True
- watch_in: - watch_in:
- service: prometheus-service-running-{{ name }} - service: prometheus-service-running-{{ name }}

View File

@ -53,10 +53,10 @@ control 'prometheus components' do
describe user('mysqld_exporter') do describe user('mysqld_exporter') do
it { should exist } it { should exist }
end end
describe group('prometheus_bigquery_remote_st...') do describe group('prometheus_bigqu') do
it { should exist } it { should exist }
end end
describe user('prometheus_bigquery_remote_st...') do describe user('prometheus_bigquery_remote_stora') do
it { should exist } it { should exist }
end end
describe directory('/var/lib/prometheus') do describe directory('/var/lib/prometheus') do
@ -173,7 +173,7 @@ control 'prometheus components' do
end end
describe directory('/var/lib/prometheus/prometheus_bigquery_remote_storage_adapter') do # rubocop:disable Layout/LineLength describe directory('/var/lib/prometheus/prometheus_bigquery_remote_storage_adapter') do # rubocop:disable Layout/LineLength
it { should exist } it { should exist }
its('group') { should eq 'prometheus_bigquery_remote_st...' } its('group') { should eq 'prometheus_bigqu' }
end end
describe file("#{service_dir}/prometheus-bigquery-backend.service") do describe file("#{service_dir}/prometheus-bigquery-backend.service") do
it { should exist } it { should exist }