Compare commits

..

2 Commits

Author SHA1 Message Date
3b76fd4a41
fix(environ): remove stray control characters
Remove useless "%}" from comment in file.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-02-15 03:17:54 +01:00
e6da2aa7b3
feat(suse): support packaged installations
- add all components available in the default openSUSE Leap (OSS)
  repository to osfamilymap
- introduce global manage_user_group toggle to prevent the formula from
  changing users and groups managed by system packages

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-02-15 03:17:54 +01:00
2 changed files with 10 additions and 2 deletions

View File

@ -18,8 +18,10 @@ prometheus-archive-install-prerequisites:
file.directory:
- name: {{ p.dir.var }}
- makedirs: True
{%- if p.manage_user_group %}
- require:
- sls: {{ sls_config_users }}
{%- endif %}
{%- if grains.os != 'Windows' %}
- mode: 755
- user: {{ p.identity.rootuser }}
@ -99,12 +101,14 @@ prometheus-archive-install-{{ name }}-file-directory:
- name: {{ p.dir.var }}{{ p.div }}{{ name }}
- makedirs: True
{%- if grains.os != 'Windows' %}
- mode: '0755'
{%- if p.manage_user_group %}
- user: {{ name }}
- group: {{ name }}
- mode: '0755'
- require:
- user: prometheus-config-users-install-{{ name }}-user-present
- group: prometheus-config-users-install-{{ name }}-group-present
{%- endif %}
{%- endif %}
{%- if grains.kernel|lower == 'linux' %}
@ -124,8 +128,10 @@ prometheus-archive-install-{{ name }}-managed-service:
- context:
desc: prometheus - {{ name }} service
name: {{ name }}
{%- if p.manage_user_group %}
user: {{ name }}
group: {{ name }}
{%- endif %}
env: {{ p.pkg.component[name]['service'].get('env', [])|tojson }}
workdir: {{ p.dir.var }}/{{ name }}
stop: ''
@ -158,8 +164,10 @@ prometheus-archive-install-{{ name }}-managed-service:
{% else %}
- file: prometheus-archive-install-{{ name }}
{% endif %}
{%- if p.manage_user_group %}
- user: prometheus-config-users-install-{{ name }}-user-present
- group: prometheus-config-users-install-{{ name }}-group-present
{%- endif %}
cmd.run:
- name: systemctl daemon-reload
- onchanges:

View File

@ -4,7 +4,7 @@
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import prometheus as p with context %}
{%- if p.manage_user_group or p.pkg.use_upstream_archive %}
{%- if p.manage_user_group %}
{%- for name in p.wanted.component %}
prometheus-config-users-install-{{ name }}-group-present: