Skip to content

Commit fa4bde5

Browse files
authored
Merge pull request #13 from myii/feat/add-sysctl-formula
feat(formula): add `sysctl-formula`
2 parents 02fbd20 + e0f6eff commit fa4bde5

File tree

4 files changed

+26
-1
lines changed

4 files changed

+26
-1
lines changed

pillar.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ ssf:
8484
- ssf
8585
- stack
8686
- sudoers
87+
- sysctl
8788
- syslog-ng
8889
- sysstat
8990
- systemd

ssf/defaults.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ssf_node_anchors:
1515
# An alternative method could be to use:
1616
# `git describe --abbrev=0 --tags`
1717
title: 'chore: use `semantic-release` cross-formula standard structure'
18-
body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/11'
18+
body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/13'
1919
github:
2020
owner: saltstack-formulas
2121
repo: ''
@@ -283,6 +283,7 @@ ssf:
283283
ssf: *formula_default
284284
stack: *formula_default
285285
sudoers: *formula_default
286+
sysctl: *formula_default
286287
syslog-ng: *formula_default
287288
sysstat: *formula_default
288289
systemd: *formula_default

ssf/files/tofs_template-formula/docs/CONTRIBUTING.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ These formulas are already compatible with semantic-release:
190190
* `rkhunter-formula <https://github.com/saltstack-formulas/rkhunter-formula>`_
191191
* `salt-formula <https://github.com/saltstack-formulas/salt-formula>`_
192192
* `sudoers-formula <https://github.com/saltstack-formulas/sudoers-formula>`_
193+
* `sysctl-formula <https://github.com/saltstack-formulas/sysctl-formula>`_
193194
* `syslog-ng-formula <https://github.com/saltstack-formulas/syslog-ng-formula>`_
194195
* `sysstat-formula <https://github.com/saltstack-formulas/sysstat-formula>`_
195196
* `systemd-formula <https://github.com/saltstack-formulas/systemd-formula>`_

ssf/formulas.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,28 @@ ssf:
944944
platforms: *platforms_old
945945
platforms_matrix: *platforms_matrix_old
946946
semrel_files: *semrel_files_default
947+
sysctl:
948+
context:
949+
git:
950+
github:
951+
repo: sysctl-formula
952+
inspec_suites_kitchen:
953+
0:
954+
inspec_yml:
955+
summary: >-
956+
Verify that the sysctl formula is setup and configured correctly
957+
provisioner:
958+
pillars_from_files:
959+
- .sls: test/salt/pillar/sysctl.sls
960+
platforms_matrix:
961+
# [os , os_ver, salt_ver, py_ver, inspec_suite]
962+
- [debian , 10 , develop, 3, default]
963+
- [ubuntu , 18.04, 2019.2, 3, default]
964+
- [amazonlinux , 2 , 2019.2, 2, default]
965+
- [fedora , 29 , 2018.3, 2, default]
966+
- [opensuse/leap, 15 , 2018.3, 2, default]
967+
# - [centos , 6 , 2017.7, 2, default]
968+
semrel_files: *semrel_files_default
947969
syslog-ng:
948970
context:
949971
git:

0 commit comments

Comments
 (0)