Compare commits
2 Commits
3b76fd4a41
...
8792164b4e
Author | SHA1 | Date | |
---|---|---|---|
8792164b4e | |||
5f19c6b94c |
@ -18,10 +18,8 @@ prometheus-archive-install-prerequisites:
|
|||||||
file.directory:
|
file.directory:
|
||||||
- name: {{ p.dir.var }}
|
- name: {{ p.dir.var }}
|
||||||
- makedirs: True
|
- makedirs: True
|
||||||
{%- if p.manage_user_group %}
|
|
||||||
- require:
|
- require:
|
||||||
- sls: {{ sls_config_users }}
|
- sls: {{ sls_config_users }}
|
||||||
{%- endif %}
|
|
||||||
{%- if grains.os != 'Windows' %}
|
{%- if grains.os != 'Windows' %}
|
||||||
- mode: 755
|
- mode: 755
|
||||||
- user: {{ p.identity.rootuser }}
|
- user: {{ p.identity.rootuser }}
|
||||||
@ -101,14 +99,12 @@ 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' %}
|
||||||
- mode: '0755'
|
|
||||||
{%- if p.manage_user_group %}
|
|
||||||
- user: {{ name }}
|
- user: {{ name }}
|
||||||
- group: {{ name }}
|
- group: {{ name }}
|
||||||
|
- mode: '0755'
|
||||||
- require:
|
- require:
|
||||||
- user: prometheus-config-users-install-{{ name }}-user-present
|
- user: prometheus-config-users-install-{{ name }}-user-present
|
||||||
- group: prometheus-config-users-install-{{ name }}-group-present
|
- group: prometheus-config-users-install-{{ name }}-group-present
|
||||||
{%- endif %}
|
|
||||||
|
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- if grains.kernel|lower == 'linux' %}
|
{%- if grains.kernel|lower == 'linux' %}
|
||||||
@ -128,10 +124,8 @@ prometheus-archive-install-{{ name }}-managed-service:
|
|||||||
- context:
|
- context:
|
||||||
desc: prometheus - {{ name }} service
|
desc: prometheus - {{ name }} service
|
||||||
name: {{ name }}
|
name: {{ name }}
|
||||||
{%- if p.manage_user_group %}
|
|
||||||
user: {{ name }}
|
user: {{ name }}
|
||||||
group: {{ name }}
|
group: {{ name }}
|
||||||
{%- endif %}
|
|
||||||
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: ''
|
||||||
@ -164,10 +158,8 @@ prometheus-archive-install-{{ name }}-managed-service:
|
|||||||
{% else %}
|
{% else %}
|
||||||
- file: prometheus-archive-install-{{ name }}
|
- file: prometheus-archive-install-{{ name }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{%- if p.manage_user_group %}
|
|
||||||
- user: prometheus-config-users-install-{{ name }}-user-present
|
- user: prometheus-config-users-install-{{ name }}-user-present
|
||||||
- group: prometheus-config-users-install-{{ name }}-group-present
|
- group: prometheus-config-users-install-{{ name }}-group-present
|
||||||
{%- endif %}
|
|
||||||
cmd.run:
|
cmd.run:
|
||||||
- name: systemctl daemon-reload
|
- name: systemctl daemon-reload
|
||||||
- onchanges:
|
- onchanges:
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
{%- set tplroot = tpldir.split('/')[0] %}
|
{%- set tplroot = tpldir.split('/')[0] %}
|
||||||
{%- from tplroot ~ "/map.jinja" import prometheus as p with context %}
|
{%- from tplroot ~ "/map.jinja" import prometheus as p with context %}
|
||||||
|
|
||||||
{%- if p.manage_user_group %}
|
{%- if p.manage_user_group or p.pkg.use_upstream_archive %}
|
||||||
{%- for name in p.wanted.component %}
|
{%- for name in p.wanted.component %}
|
||||||
|
|
||||||
prometheus-config-users-install-{{ name }}-group-present:
|
prometheus-config-users-install-{{ name }}-group-present:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user