Merge pull request #79 from myii/feat/add-apache-formula

feat(formula): add `apache-formula`

Author: myii

pillar.example

@@ -69,6 +69,7 @@ ssf:
   ### State the formulas and files to work through when running the formula
   active:
     semrel_formulas:
+      - apache
       - apt
       - apt-cacher
       - bind

ssf/defaults.yaml

@@ -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: 'ci(travis): remove `PyYAML` workaround since fixed in `salt-lint` v0.0.9'
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/80'
+            title: 'feat(semantic-release): implement for this formula'
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/79'
             # yamllint enable rule:line-length
           github:
             owner: 'saltstack-formulas'
@@ -263,6 +263,7 @@ ssf:
         active: false
         source: 'salt://ssf/files/default/git/git_30_create_PR.sh'
   semrel_formulas:
+    apache: *formula_default
     apt:
       <<: *formula_default
       context:

ssf/files/tofs_apache-formula/.salt-lint

@@ -0,0 +1,26 @@
+# -*- 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
+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
+  # Skipping `207` and `208` because `210` is sufficient, at least for the time-being
+  # I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755`
+  - 207  # File modes should always be encapsulated in quotation marks
+  - 208  # File modes should always contain a leading zero
+tags: []
+verbosity: 1

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

@@ -163,8 +163,9 @@ Semantic release formulas
 
 These formulas are already compatible with semantic-release:
 
-* `apt-formula <https://github.com/saltstack-formulas/apt-formula>`_
+* `apache-formula <https://github.com/saltstack-formulas/apache-formula>`_
 * `apt-cacher-formula <https://github.com/saltstack-formulas/apt-cacher-formula>`_
+* `apt-formula <https://github.com/saltstack-formulas/apt-formula>`_
 * `bind-formula <https://github.com/saltstack-formulas/bind-formula>`_
 * `cert-formula <https://github.com/saltstack-formulas/cert-formula>`_
 * `chrony-formula <https://github.com/saltstack-formulas/chrony-formula>`_

ssf/formulas.yaml

@@ -217,6 +217,34 @@ ssf_node_anchors:
 
 ssf:
   semrel_formulas:
+    apache:
+      context:
+        git:
+          github:
+            repo: 'apache-formula'
+        inspec_suites_kitchen:
+          0:
+            inspec_yml:
+              summary: >-
+                Verify that the apache formula is setup and configured correctly
+            provisioner:
+              pillars_from_files:
+                - .sls: 'test/salt/pillar/default.sls'
+              state_top:
+                - '*':
+                    - .
+                    - .mod_security
+        platforms_matrix:
+          # Comments in `platforms` apply here, too
+          # [os           , os_ver, salt_ver, py_ver,    inspec_suite]
+          - [debian       ,  10   ,  develop,      3,         default]
+          - [ubuntu       ,  18.04,   2019.2,      3,         default]
+          - [amazonlinux  ,   2   ,   2019.2,      2,         default]
+          # - [arch-base    , latest,   2019.2,      2,         default]
+          - [fedora       ,  29   ,   2018.3,      2,         default]
+          # - [opensuse/leap,  15   ,   2018.3,      2,         default]
+          - [centos       ,   6   ,   2017.7,      2,         default]
+      semrel_files: *semrel_files_default
     apt:
       context:
         git: