Linting #33

Merged
Georg merged 3 commits from linting into production 2023-02-15 23:22:08 +01:00
8 changed files with 28 additions and 12 deletions

View File

@ -1,9 +1,22 @@
---
# yamllint disable rule:line-length
skip_clone: true
pipeline:
lint:
image: registry.opensuse.org/home/crameleon/libertacasa/containers/containerfile/libertacasa/pipeline-lint:latest
secrets: [ci_netrc_username, ci_netrc_password, ci_netrc_machine]
when:
event: [push]
commands:
- git clone --single-branch -b $CI_COMMIT_BRANCH $CI_REPO_LINK ../salt-libertacasa-linting
- cd ../salt-libertacasa-linting
- find . -type f \( -name '*.yaml' -o -name '*.yml' \) -exec yamllint -f colored -s {} +
- find . -name '*.sls' -exec salt-lint --severity -x 204 {} +
check:
image: registry.opensuse.org/home/crameleon/libertacasa/containers/containerfile/libertacasa/pipeline:latest
secrets: [ ci_netrc_username, ci_netrc_password, ci_netrc_machine ]
secrets: [ci_netrc_username, ci_netrc_password, ci_netrc_machine]
when:
event: [push]
commands:
@ -29,5 +42,5 @@ pipeline:
event: [push]
instance: woodpecker-orpheus.intranet.squirrelcube.com
commands:
#- rolesyncer
# - rolesyncer
- bin/rolesyncer.py

View File

@ -1,3 +1,4 @@
---
- firewalld
- keepalived
- nginx

View File

@ -46,7 +46,7 @@ matterbridge_{{ instance }}_mediadir:
- user: matterbridge
{#- to-do: implement some shared group #}
- group: lighttpd
- mode: 750
- mode: '0750'
- makedirs: True
{%- endif %}

View File

@ -5,6 +5,6 @@ include:
file.managed:
- user: keepalived_script
- group: wheel
- mode: 750
- mode: '0750'
- template: jinja
- source: salt://{{ slspath }}/files/failover.sh.j2

View File

@ -17,7 +17,7 @@ salt_master_extension_modules_dirs:
{%- endfor %}
- user: root
- group: salt
- mode: 0755
- mode: '0755'
salt_master_extension_modules_bins:
file.managed:
@ -30,7 +30,7 @@ salt_master_extension_modules_bins:
{%- endfor %}
- user: root
- group: salt
- mode: 0640
- mode: '0640'
- require:
- file: salt_master_extension_modules_dirs
@ -72,7 +72,7 @@ salt_master_extra_packages:
- requirepass {{ master_pillar['cache.redis.password'] }}
- user: root
- group: redis
- mode: 0640
- mode: '0640'
- require:
- pkg: redis
@ -80,7 +80,7 @@ salt_master_extra_packages:
file.directory:
- user: redis
- group: redis
- mode: 0750
- mode: '0750'
- require:
- pkg: redis

View File

@ -1,5 +1,7 @@
{%- set netbox_pillar = salt['pillar.get']('netbox') -%}
{%- if 'custom_fields' in netbox_pillar and netbox_pillar['custom_fields']['salt_roles'] is not none and 'salt.syndic' in netbox_pillar['custom_fields']['salt_roles'] -%}
{%- if 'custom_fields' in netbox_pillar
and netbox_pillar['custom_fields']['salt_roles'] is not none
and 'salt.syndic' in netbox_pillar['custom_fields']['salt_roles'] -%}
{%- set master = salt['pillar.get']('salt:master:syndic_master') -%}
{%- elif 'config_context' in netbox_pillar -%}
{%- set master = netbox_pillar['config_context']['salt_master'] -%}