Skip to content

Commit 88f4f50

Browse files
committed
feat(formula): add apache-formula
1 parent 63c9417 commit 88f4f50

File tree

5 files changed

+60
-3
lines changed

5 files changed

+60
-3
lines changed

pillar.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ ssf:
6969
### State the formulas and files to work through when running the formula
7070
active:
7171
semrel_formulas:
72+
- apache
7273
- apt
7374
- apt-cacher
7475
- bind

ssf/defaults.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ ssf_node_anchors:
2222
# An alternative method could be to use:
2323
# `git describe --abbrev=0 --tags`
2424
# yamllint disable rule:line-length
25-
title: 'ci(travis): remove `PyYAML` workaround since fixed in `salt-lint` v0.0.9'
26-
body: '* Automated using https://github.com/myii/ssf-formula/pull/80'
25+
title: 'feat(semantic-release): implement for this formula'
26+
body: '* Automated using https://github.com/myii/ssf-formula/pull/79'
2727
# yamllint enable rule:line-length
2828
github:
2929
owner: 'saltstack-formulas'
@@ -263,6 +263,7 @@ ssf:
263263
active: false
264264
source: 'salt://ssf/files/default/git/git_30_create_PR.sh'
265265
semrel_formulas:
266+
apache: *formula_default
266267
apt:
267268
<<: *formula_default
268269
context:
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=yaml
3+
---
4+
exclude_paths:
5+
# Violation: [203] Most files should not contain tabs
6+
# Violation: [204] Lines should be no longer that 160 chars
7+
- apache/files/Debian/apache-2.4.config.jinja # 203
8+
- apache/files/Debian/mpm/mpm_event.conf.jinja # 203
9+
- apache/files/Debian/mpm/mpm_prefork.conf.jinja # 203
10+
- apache/files/Debian/mpm/mpm_worker.conf.jinja # 203
11+
- apache/files/Debian/ssl.conf.jinja # 203,204
12+
- apache/files/FreeBSD/mod_cgi.conf.jinja # 203
13+
- apache/files/FreeBSD/mod_ssl.conf.jinja # 203,204
14+
- apache/files/RedHat/conf.modules.d/00-mpm.conf.jinja # 203
15+
- apache/files/RedHat/modsecurity.conf.jinja # 203
16+
- apache/files/tls-defaults.conf.jinja # 204
17+
- apache/logrotate.sls # 203
18+
skip_list:
19+
# Using `salt-lint` for linting other files as well, such as Jinja macros/templates
20+
- 205 # Use ".sls" as a Salt State file extension
21+
# Skipping `207` and `208` because `210` is sufficient, at least for the time-being
22+
# I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755`
23+
- 207 # File modes should always be encapsulated in quotation marks
24+
- 208 # File modes should always contain a leading zero
25+
tags: []
26+
verbosity: 1

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,9 @@ Semantic release formulas
163163

164164
These formulas are already compatible with semantic-release:
165165

166-
* `apt-formula <https://github.com/saltstack-formulas/apt-formula>`_
166+
* `apache-formula <https://github.com/saltstack-formulas/apache-formula>`_
167167
* `apt-cacher-formula <https://github.com/saltstack-formulas/apt-cacher-formula>`_
168+
* `apt-formula <https://github.com/saltstack-formulas/apt-formula>`_
168169
* `bind-formula <https://github.com/saltstack-formulas/bind-formula>`_
169170
* `cert-formula <https://github.com/saltstack-formulas/cert-formula>`_
170171
* `chrony-formula <https://github.com/saltstack-formulas/chrony-formula>`_

ssf/formulas.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,34 @@ ssf_node_anchors:
217217

218218
ssf:
219219
semrel_formulas:
220+
apache:
221+
context:
222+
git:
223+
github:
224+
repo: 'apache-formula'
225+
inspec_suites_kitchen:
226+
0:
227+
inspec_yml:
228+
summary: >-
229+
Verify that the apache formula is setup and configured correctly
230+
provisioner:
231+
pillars_from_files:
232+
- .sls: 'test/salt/pillar/default.sls'
233+
state_top:
234+
- '*':
235+
- .
236+
- .mod_security
237+
platforms_matrix:
238+
# Comments in `platforms` apply here, too
239+
# [os , os_ver, salt_ver, py_ver, inspec_suite]
240+
- [debian , 10 , develop, 3, default]
241+
- [ubuntu , 18.04, 2019.2, 3, default]
242+
- [amazonlinux , 2 , 2019.2, 2, default]
243+
# - [arch-base , latest, 2019.2, 2, default]
244+
- [fedora , 29 , 2018.3, 2, default]
245+
# - [opensuse/leap, 15 , 2018.3, 2, default]
246+
- [centos , 6 , 2017.7, 2, default]
247+
semrel_files: *semrel_files_default
220248
apt:
221249
context:
222250
git:

0 commit comments

Comments
 (0)