summaryrefslogtreecommitdiffstats
path: root/salt
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-02-15 23:08:18 +0100
committerGeorg Pfuetzenreuter2023-02-15 23:18:54 +0100
commit18d28c3b7fed42e29eb9ff7b11b4dd1a54f8a510 (patch)
treee16882e59a3f08fe1a09220d2a8d7c8358b7f23c /salt
parentcd93d792fff7bde02f75aa9d704de644be290b1a (diff)
downloadsalt-18d28c3b7fed42e29eb9ff7b11b4dd1a54f8a510.tar.gz
salt-18d28c3b7fed42e29eb9ff7b11b4dd1a54f8a510.tar.bz2
salt-18d28c3b7fed42e29eb9ff7b11b4dd1a54f8a510.zip
Address salt-lint errors/warnings
- remove trailing whitespaces - format octal modes correctly Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Diffstat (limited to 'salt')
-rw-r--r--salt/profile/matterbridge/init.sls2
-rw-r--r--salt/profile/netcup_failover/init.sls2
-rw-r--r--salt/profile/salt/master.sls8
-rw-r--r--salt/profile/salt/minion.sls4
4 files changed, 9 insertions, 7 deletions
diff --git a/salt/profile/matterbridge/init.sls b/salt/profile/matterbridge/init.sls
index c90225b..264f4e1 100644
--- a/salt/profile/matterbridge/init.sls
+++ b/salt/profile/matterbridge/init.sls
@@ -46,7 +46,7 @@ matterbridge_{{ instance }}_mediadir:
- user: matterbridge
{#- to-do: implement some shared group #}
- group: lighttpd
- - mode: 750
+ - mode: '0750'
- makedirs: True
{%- endif %}
diff --git a/salt/profile/netcup_failover/init.sls b/salt/profile/netcup_failover/init.sls
index c4d5679..f0227e0 100644
--- a/salt/profile/netcup_failover/init.sls
+++ b/salt/profile/netcup_failover/init.sls
@@ -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
diff --git a/salt/profile/salt/master.sls b/salt/profile/salt/master.sls
index a8dce54..f0fdc7c 100644
--- a/salt/profile/salt/master.sls
+++ b/salt/profile/salt/master.sls
@@ -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
diff --git a/salt/profile/salt/minion.sls b/salt/profile/salt/minion.sls
index 5d33845..7d2ad54 100644
--- a/salt/profile/salt/minion.sls
+++ b/salt/profile/salt/minion.sls
@@ -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'] -%}