Merge pull request #56 from A1EF/master

Fixes for linters

Author: grandmotivator

.pre-commit-config.yaml

@@ -6,37 +6,37 @@
 default_stages: [commit]
 repos:
   - repo: https://github.com/rubocop-hq/rubocop
-    rev: v1.29.1
+    rev: v1.50.1
     hooks:
       - id: rubocop
         name: Check Ruby files with rubocop
         args: [--debug]
         always_run: true
         pass_filenames: false
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.8.0.4
+    rev: v0.9.0.2
     hooks:
       - id: shellcheck
         name: Check shell scripts with shellcheck
         args: [--severity=error]
         files: ^.*\.(sh|bash|ksh)$
         types: []
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.26.3
+    rev: v1.30.0
     hooks:
       - id: yamllint
         name: Check YAML syntax with yamllint
         args: [--strict, '.']
         always_run: true
         pass_filenames: false
   - repo: https://github.com/warpnet/salt-lint
-    rev: v0.8.0
+    rev: v0.9.2
     hooks:
       - id: salt-lint
         name: Check Salt files using salt-lint
         files: ^.*\.(sls|jinja|j2|tmpl|tst)$
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.4.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace

.salt-lint

@@ -7,7 +7,7 @@ exclude_paths:
 rules:
   206:  # Jinja variables should have spaces before and after: '{{ var_name }}'
     ignore: |
-      salt/exim/init.sls
+      salt/exim.sls
 skip_list:
   # Using `salt-lint` for linting other files as well, such as Jinja macros/templates
   - 205  # Use ".sls" as a Salt State file extension

bin/kitchen

@@ -19,8 +19,8 @@ if File.file?(bundle_binstub)
     load(bundle_binstub)
   else
     abort(
-      'Your `bin/bundle` was not generated by Bundler, '\
-      'so this binstub cannot run.  Replace `bin/bundle` by running '\
+      'Your `bin/bundle` was not generated by Bundler, ' \
+      'so this binstub cannot run.  Replace `bin/bundle` by running ' \
       '`bundle binstubs bundler --force`, then run this command again.'
     )
   end

salt/apt/init.sls renamed to salt/apt.sls

@@ -6,7 +6,7 @@
     - mode: 700
     - template: jinja
     - context:
-      backup_dir: {{ pillar['backup_dir'] }}
+        backup_dir: {{ pillar['backup_dir'] }}
 
 /root/backup_site.sh:
   file.managed:
@@ -16,8 +16,8 @@
     - mode: 700
     - template: jinja
     - context:
-      backup_dir: {{ pillar['backup_dir'] }}
-      backup_site_list: {{ pillar['backup_sites'] | join(' ') }}
+        backup_dir: {{ pillar['backup_dir'] }}
+        backup_site_list: {{ pillar['backup_sites'] | join(' ') }}
 
 #backup-mysql:
 #  cron.present: