updated states (lints) / updated .drone.yml
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Paul 2022-06-10 00:13:19 +02:00
parent f687ec510c
commit 24500ff074
12 changed files with 24 additions and 24 deletions

View File

@ -10,4 +10,6 @@ steps:
- apt-get update -y - apt-get update -y
- apt-get upgrade -y - apt-get upgrade -y
- pip3 install salt-lint - pip3 install salt-lint
- salt-lint states - >
'find states -type f -name "*.sls" -print0 |'
' xargs -0 --no-run-if-empty salt-lint'

View File

@ -8,7 +8,7 @@ apparmor-{{ cfg }}:
- source: "salt://apparmor/{{ cfg }}.j2" - source: "salt://apparmor/{{ cfg }}.j2"
- user: root - user: root
- group: root - group: root
- mode: 0644 - mode: "0644"
- template: jinja - template: jinja
- watch_in: - watch_in:
- service: apparmor-reload - service: apparmor-reload

View File

@ -1,11 +1,11 @@
--- ---
{%- from "apt/map.jinja" import apt with context %} {%- from "apt/map.jinja" import apt with context %}
{% for k, v in apt.config.items() -%} {% for itemkey, itemvalue in apt.config.items() -%}
apt-proxy-{{ k }}: apt-proxy-{{ itemkey }}:
file.managed: file.managed:
- name: /etc/apt/apt.conf.d/{{ k }} - name: /etc/apt/apt.conf.d/{{ k }}
- user: root - user: root
- group: root - group: root
- mode: 0644 - mode: "0644"
- contents: {{ v.content }} - contents: {{ itemvalue.content }}
{% endfor -%} {% endfor -%}

View File

@ -2,10 +2,10 @@
gufw-cfg: gufw-cfg:
file.managed: file.managed:
- source: salt://gufw/gufw.cfg - source: salt://gufw/gufw.cfg
- name: /etc/gufw/gufw.cfg - name: /etc/gufw/gufw.cfg
- user: root - user: root
- group: root - group: root
- mode: 600 - mode: "0600"
gufw-desktop-cfg: gufw-desktop-cfg:
file.managed: file.managed:
@ -13,4 +13,4 @@ gufw-desktop-cfg:
- name: /etc/gufw/Desktop.profile - name: /etc/gufw/Desktop.profile
- user: root - user: root
- group: root - group: root
- mode: 600 - mode: "0600"

View File

@ -16,7 +16,7 @@ maildb-apps-dir:
- name: {{ maildb.appdir }} - name: {{ maildb.appdir }}
- user: vmail - user: vmail
- group: vmail - group: vmail
- mode: 0755 - mode: "0755"
- makedirs: true - makedirs: true
maildb-script: maildb-script:
@ -25,6 +25,6 @@ maildb-script:
- source: salt://maildb/maildb.py - source: salt://maildb/maildb.py
- user: vmail - user: vmail
- group: vmail - group: vmail
- mode: 0755 - mode: "0755"
- require: - require:
- file: maildb-apps-dir - file: maildb-apps-dir

View File

@ -4,15 +4,15 @@ misc-public-dir:
- name: /home/public - name: /home/public
- user: root - user: root
- group: root - group: root
- mode: 0755 - mode: "0755"
{%- for file in salt['pillar.get']('misc_files') %} {%- for file in salt['pillar.get']('misc_files') %}
{{ file.name }}: {{ file.name }}:
file.managed: file.managed:
- name: {{ file.dest }} - name: {{ file.dest }}
- source: {{ file.src }} - source: {{ file.src }}
- source_hash: sha256={{ file.checksum }} - source_hash: sha256={{ file.checksum }}
- user: root - user: root
- group: root - group: root
- mode: 644 - mode: "0644"
{%- endfor %} {%- endfor %}

View File

@ -12,8 +12,6 @@ netbox.create_site_{{ salt['grains.get']('location') }}:
{%- endif %} {%- endif %}
{%- if salt['netbox.get'](app='dcim', endpoint='device-roles', name=salt['grains.get']('type')) == {} %} {%- if salt['netbox.get'](app='dcim', endpoint='device-roles', name=salt['grains.get']('type')) == {} %}
"{{ salt['netbox.get'](app='dcim', endpoint='sites', name='nurnberg')}}"
"{{ salt['netbox.get'](app='dcim', endpoint='device-roles', name='front')}}"
netbox.create_device_role_{{ salt['grains.get']('type') }}: netbox.create_device_role_{{ salt['grains.get']('type') }}:
module.run: module.run:
- name: netbox.create_device_role - name: netbox.create_device_role

View File

@ -8,7 +8,7 @@ nextcloud-desktop-appimage:
- skip_verify: true - skip_verify: true
- user: root - user: root
- group: root - group: root
- mode: 755 - mode: "0755"
- if_missing: {{ nextcloud_desktop.dest_path }}-{{ nextcloud_desktop.version }} - if_missing: {{ nextcloud_desktop.dest_path }}-{{ nextcloud_desktop.version }}
nextcloud-desktop-install-link: nextcloud-desktop-install-link:
@ -25,7 +25,7 @@ nextcloud-desktop-icon:
- source: salt://nextcloud_desktop/nextcloud.png - source: salt://nextcloud_desktop/nextcloud.png
- user: root - user: root
- group: root - group: root
- mode: 644 - mode: "0644"
nextcloud-desktop-icon-entry: nextcloud-desktop-icon-entry:
file.managed: file.managed:
@ -33,4 +33,4 @@ nextcloud-desktop-icon-entry:
- source: salt://nextcloud_desktop/nextcloud.desktop - source: salt://nextcloud_desktop/nextcloud.desktop
- user: root - user: root
- group: root - group: root
- mode: 644 - mode: "0644"

View File

@ -10,7 +10,7 @@ tor-config:
- source: salt://tor/torrc.j2 - source: salt://tor/torrc.j2
- user: root - user: root
- group: root - group: root
- mode: 0660 - mode: "0660"
- template: jinja - template: jinja
- watch_in: - watch_in:
- service: tor-service - service: tor-service

View File

@ -5,7 +5,7 @@ vsftpd-config:
- source: salt://vsftpd/vsftpd.conf.j2 - source: salt://vsftpd/vsftpd.conf.j2
- user: root - user: root
- group: root - group: root
- mode: 644 - mode: "0644"
- template: jinja - template: jinja
- watch_in: - watch_in:
- service: vsftpd-service - service: vsftpd-service

View File

@ -6,6 +6,6 @@ youtubedl-bin:
- source: https://github.com/ytdl-org/youtube-dl/releases/download/{{ youtubedl.version }}/youtube-dl - source: https://github.com/ytdl-org/youtube-dl/releases/download/{{ youtubedl.version }}/youtube-dl
- user: root - user: root
- group: root - group: root
- mode: 0775 - mode: "0775"
- template: jinja - template: jinja
- skip_verify: true - skip_verify: true

View File

@ -6,6 +6,6 @@ ytdlp-bin:
- source: https://github.com/yt-dlp/yt-dlp/releases/download/{{ ytdlp.version }}/yt-dlp - source: https://github.com/yt-dlp/yt-dlp/releases/download/{{ ytdlp.version }}/yt-dlp
- user: root - user: root
- group: root - group: root
- mode: 0775 - mode: "0775"
- template: jinja - template: jinja
- skip_verify: true - skip_verify: true