Skip to content

Commit

Permalink
Merge pull request #82 from myii/feat/update-for-salt-lint-0.0.10
Browse files Browse the repository at this point in the history
feat(salt-lint): update `.salt-lint` configs for `v0.0.10`
  • Loading branch information
myii authored Oct 23, 2019
2 parents da8c923 + 5f34e06 commit 78d5cd8
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 30 deletions.
4 changes: 2 additions & 2 deletions ssf/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ ssf_node_anchors:
# An alternative method could be to use:
# `git describe --abbrev=0 --tags`
# yamllint disable rule:line-length
title: 'feat(semantic-release): implement for this formula'
body: '* Automated using https://github.com/myii/ssf-formula/pull/79'
title: 'ci(travis): update `salt-lint` config for `v0.0.10` [skip ci]'
body: '* Automated using https://github.com/myii/ssf-formula/pull/82'
# yamllint enable rule:line-length
github:
owner: 'saltstack-formulas'
Expand Down
1 change: 1 addition & 0 deletions ssf/files/default/.salt-lint
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# vim: ft=yaml
---
exclude_paths: []
rules: {}
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
Expand Down
33 changes: 19 additions & 14 deletions ssf/files/tofs_apache-formula/.salt-lint
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
exclude_paths:
# Violation: [203] Most files should not contain tabs
# Violation: [204] Lines should be no longer that 160 chars
- apache/files/Debian/apache-2.4.config.jinja # 203
- apache/files/Debian/mpm/mpm_event.conf.jinja # 203
- apache/files/Debian/mpm/mpm_prefork.conf.jinja # 203
- apache/files/Debian/mpm/mpm_worker.conf.jinja # 203
- apache/files/Debian/ssl.conf.jinja # 203,204
- apache/files/FreeBSD/mod_cgi.conf.jinja # 203
- apache/files/FreeBSD/mod_ssl.conf.jinja # 203,204
- apache/files/RedHat/conf.modules.d/00-mpm.conf.jinja # 203
- apache/files/RedHat/modsecurity.conf.jinja # 203
- apache/files/tls-defaults.conf.jinja # 204
- apache/logrotate.sls # 203
exclude_paths: []
rules:
203: # Most files should not contain tabs
ignore: |
apache/files/Debian/apache-2.4.config.jinja
apache/files/Debian/mpm/mpm_event.conf.jinja
apache/files/Debian/mpm/mpm_prefork.conf.jinja
apache/files/Debian/mpm/mpm_worker.conf.jinja
apache/files/Debian/ssl.conf.jinja
apache/files/FreeBSD/mod_cgi.conf.jinja
apache/files/FreeBSD/mod_ssl.conf.jinja
apache/files/RedHat/conf.modules.d/00-mpm.conf.jinja
apache/files/RedHat/modsecurity.conf.jinja
apache/logrotate.sls
204: # Lines should be no longer that 160 chars
ignore: |
apache/files/Debian/ssl.conf.jinja
apache/files/FreeBSD/mod_ssl.conf.jinja
apache/files/tls-defaults.conf.jinja
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
Expand Down
8 changes: 5 additions & 3 deletions ssf/files/tofs_docker-formula/.salt-lint
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
exclude_paths:
# Violation: [204] Lines should be no longer that 160 chars
- docker/repo.sls
exclude_paths: []
rules:
204: # Lines should be no longer that 160 chars
ignore: |
docker/repo.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
Expand Down
1 change: 1 addition & 0 deletions ssf/files/tofs_mysql-formula/.salt-lint
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# vim: ft=yaml
---
exclude_paths: []
rules: {}
skip_list:
# TODO: Formula-specific override to remove eventually
# A lot of attention is going to be needed to resolve the existing long lines
Expand Down
6 changes: 4 additions & 2 deletions ssf/files/tofs_openssh-formula/.salt-lint
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
exclude_paths:
# This is actually a Python file
- _pillar/known_hosts_salt_ssh.sls
# Violation: [204] Lines should be no longer that 160 chars
- test/salt/pillar/default.sls
rules:
204: # Lines should be no longer that 160 chars
ignore: |
test/salt/pillar/default.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
Expand Down
1 change: 1 addition & 0 deletions ssf/files/tofs_php-formula/.salt-lint
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
exclude_paths:
# Save time spent checking files by avoiding the deprecated `ng/` directory
- php/ng/
rules: {}
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
Expand Down
9 changes: 5 additions & 4 deletions ssf/files/tofs_postfix-formula/.salt-lint
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
exclude_paths:
# https://github.com/saltstack-formulas/postfix-formula/issues/101
# Violation: [203] Most files should not contain tabs
- postfix/files/mapping.j2
exclude_paths: []
rules:
203: # Most files should not contain tabs
ignore: |
postfix/files/mapping.j2
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
Expand Down
13 changes: 8 additions & 5 deletions ssf/files/tofs_zabbix-formula/.salt-lint
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
exclude_paths:
exclude_paths: []
rules:
# https://github.com/saltstack-formulas/zabbix-formula/issues/129
# Violation: [203] Most files should not contain tabs
- zabbix/files/default/etc/zabbix/web/zabbix.conf.php.jinja
# Violation: [204] Lines should be no longer that 160 chars
- zabbix/files/default/etc/zabbix/zabbix_proxy.conf.jinja
203: # Most files should not contain tabs
ignore: |
zabbix/files/default/etc/zabbix/web/zabbix.conf.php.jinja
204: # Lines should be no longer that 160 chars
ignore: |
zabbix/files/default/etc/zabbix/zabbix_proxy.conf.jinja
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
Expand Down

0 comments on commit 78d5cd8

Please sign in to comment.