linted states
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Paul 2022-06-10 00:39:52 +02:00
parent e1770e33cb
commit 2e7242c9f3
8 changed files with 27 additions and 13 deletions

View File

@ -10,4 +10,4 @@ steps:
- apt-get update -y
- apt-get upgrade -y
- pip3 install salt-lint
- salt-lint states/*/*.sls
- salt-lint -x 207,208,210 states/*/*.sls

View File

@ -22,7 +22,16 @@ acmesh-upgrade:
acmesh-run:
cmd.run:
- name: /root/.acme.sh/acme.sh --debug --issue {%- for domain in acme.domains %} -d '{{ domain }}' {% endfor -%} --dns dns_ovh --cert-file '' --fullchain-file '{{ acme.fullcertfile }}' --key-file '{{ acme.keyfile }}' -k {{ acme.keysize }}
- name: >
/root/.acme.sh/acme.sh --debug --issue
{%- for domain in acme.domains %}
-d '{{ domain }}'
{% endfor -%}
--dns dns_ovh
--cert-file ''
--fullchain-file '{{ acme.fullcertfile }}'
--key-file '{{ acme.keyfile }}'
-k {{ acme.keysize }}
- env:
- OVH_AK: '{{ acme.provider.api.application_key }}'
- OVH_AS: '{{ acme.provider.api.application_secret }}'

View File

@ -4,7 +4,7 @@ dkron-config-dir:
file.directory:
- name: /etc/dkron
- user: {{ dkron.runuser }}
dkron-config:
file.managed:
- name: /etc/dkron/dkron.yml

View File

@ -26,10 +26,10 @@ postfix-sender-access-maps:
postfix-transport:
cmd.run:
- name: postmap transport
- name: postmap transport
- cwd: {{ postfix.base_dir }}
postfix-sender-access:
cmd.run:
- name: postmap sender_access
- name: postmap sender_access
- cwd: {{ postfix.base_dir }}

View File

@ -6,7 +6,12 @@ telegraf-archive-extract:
- name: {{ telegraf.release_dir }}/telegraf-{{ telegraf.version }}
- source: {{ telegraf.mirror }}/telegraf-{{ telegraf.version }}_{{ salt['grains.get']('kernel')|lower }}_{{ salt['grains.get']('osarch') }}.tar.gz
- enforce_toplevel: false
- options: --transform 's|^\{{ archive_exclude_dir }}|/|g' --exclude '{{ archive_exclude_dir }}/etc' --exclude '{{ archive_exclude_dir }}/usr/lib' --exclude '{{ archive_exclude_dir }}/var' --strip 2
- options: >
--transform 's|^\{{ archive_exclude_dir }}|/|g'
--exclude '{{ archive_exclude_dir }}/etc'
--exclude '{{ archive_exclude_dir }}/usr/lib'
--exclude '{{ archive_exclude_dir }}/var'
--strip 2
- skip_verify: true
- archive_format: tar
- if_missing: {{ telegraf.release_dir }}/telegraf-{{ telegraf.version }}/telegraf

View File

@ -9,7 +9,7 @@ telegram-archive-extract:
- enforce_toplevel: false
- options: --transform 's/Telegram/telegram/g' --transform 's/Updater/updater/g' --strip 1
- keep: true
- if_missing: {{ telegram.release_dir }}/telegram-{{ telegram.version }}/telegram
- if_missing: {{ telegram.release_dir }}/telegram-{{ telegram.version }}/telegram
telegram-symlink:
file.symlink:

View File

@ -4,7 +4,7 @@ time-ntp-config-file:
file.managed:
- name: /etc/ntp.conf
- source: salt://time/ntp.conf.j2
- user: root
- user: root
- group: root
- mode: 644
- template: jinja

View File

@ -2,13 +2,13 @@
{%- from "users/map.jinja" import users with context -%}
{%- for name, user in users.items() %}
{%- if not user.enabled %}
user-{{ name }}:
user.absent:
{%- if not user.enabled %}
user-{{ name }}:
user.absent:
- name: {{ name }}
{%- endif %}
{%- if user.enabled %}
user-{{ name }}:
user.present: