sous-chefs · JohnRoesler · Oct 18, 2019 · May 21, 2019 · May 21, 2019 · May 21, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,17 +1,30 @@
-version: 2.1
+---
+lint_and_unit: &lint_and_unit
+  - delivery
+  - danger
+  - lint-yaml
+  - lint-markdown
 
+version: 2.1
 orbs:
-  kitchen: sous-chefs/kitchen@1.0.0
+  kitchen: sous-chefs/kitchen@2
 
 workflows:
   kitchen:
     jobs:
+      # Lint and Unit Test
+      - kitchen/yamllint:
+          name: lint-yaml
+      - kitchen/mdlint:
+          name: lint-markdown
       - kitchen/danger:
           name: danger
           context: Danger
-      - kitchen/lint:
-          name: lint
-      # - kitchen/dokken:
-      #     name: default
-      #     suite: default
-      #     requires: [  danger, lint ]
+      - kitchen/delivery:
+          name: delivery
+
+      - kitchen/dokken-single:
+          name: default
+          suite: default
+          requires:
+            *lint_and_unit
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/lock.yml b/.github/lock.yml
@@ -1,28 +1,8 @@
-# Configuration for lock-threads - https://github.com/dessant/lock-threads
-
-# Number of days of inactivity before a closed issue or pull request is locked
-daysUntilLock: 365
-
-# Issues and pull requests with these labels will not be locked. Set to `[]` to disable
+---
+daysUntilLock: 30
 exemptLabels: []
-
-# Label to add before locking, such as `outdated`. Set to `false` to disable
 lockLabel: false
-
-# Comment to post before locking. Set to `false` to disable
 lockComment: >
   This thread has been automatically locked since there has not been
   any recent activity after it was closed. Please open a new issue for
   related bugs.
-
-# Limit to only `issues` or `pulls`
-# only: issues
-
-# Optionally, specify configuration settings just for `issues` or `pulls`
-# issues:
-#   exemptLabels:
-#     - help-wanted
-#   lockLabel: outdated
-
-# pulls:
-#   daysUntilLock: 30
diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml
diff --git a/.mdlrc b/.mdlrc
@@ -0,0 +1 @@
+rules "~MD013"
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,3 +1,4 @@
+---
 AllCops:
   Exclude:
     - 'Dangerfile'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,7 +31,7 @@ This file is used to list changes made in each version of the snort cookbook.
 
 - Added new snort_service custom resource and a _service.rb recipe. The recipe is called by the default.rb recipe. The custom resource can be used to write wrapper cookbooks and supports the standard service actions (enable, start, restart, reload). The custom resource used the new Chef 12.5 customer resource format and the compat_resource cookbook for compatibility with 12.0+
 
-## v1.1.0:
+## v1.1.0
 
 - Updated to the latest daq and snort packages for RHEL
 - Added Chefspecs for RHEL/Debian platforms
@@ -45,7 +45,7 @@ This file is used to list changes made in each version of the snort cookbook.
 - Removed references to database output from the Readme
 - Added a Rakefile for simplified testing
 
-## v1.0.0:
+## v1.0.0
 
 - Updated to the latest Snort packages on RHEL / Fedora. For RHEL the minimum supported release is now RHEL 7 due to Snort requirements
 - The default package action is now install and not upgrade to prevent service restarts on Chef runs
@@ -58,6 +58,6 @@ This file is used to list changes made in each version of the snort cookbook.
 - Added a Gemfile with development dependencies
 - Added a Berksfile for development dependencies
 
-## v0.10.0:
+## v0.10.0
 
 - [COOK-1512] - Update SNORT cookbook with upstream changes for RHEL platforms
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -10,7 +10,6 @@ The master branch is the current committed changes. These changes may not yet be
 
 All releases are tagged in git. To see the releases available to you see the changelog or the tags directly.
 
-
 ## Pull requests
 
 - <https://github.com/sous-chefs/snort/pulls>

diff --git a/TESTING.md b/TESTING.md
@@ -1,2 +1,3 @@
-Please refer to
-https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/TESTING.MD
+# Testing
+
+Please refer to [the community cookbook documentation on testing](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/TESTING.MD).
diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml
@@ -0,0 +1,84 @@
+---
+driver:
+  name: dokken
+  privileged: true # because Docker and SystemD/Upstart
+  chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
+  env: [CHEF_LICENSE=accept]
+
+transport:
+  name: dokken
+
+provisioner:
+  name: dokken
+  deprecations_as_errors: true
+
+platforms:
+  - name: amazonlinux
+    driver:
+      image: dokken/amazonlinux
+      pid_one_command: /sbin/init
+
+  - name: debian-8
+    driver:
+      image: dokken/debian-8
+      pid_one_command: /bin/systemd
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update
+
+  - name: debian-9
+    driver:
+      image: dokken/debian-9
+      pid_one_command: /bin/systemd
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update
+
+  - name: centos-6
+    driver:
+      image: dokken/centos-6
+      pid_one_command: /sbin/init
+
+  - name: centos-7
+    driver:
+      image: dokken/centos-7
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: fedora-26
+    driver:
+      image: dokken/fedora-26
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: fedora-27
+    driver:
+      image: dokken/fedora-27
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: fedora-latest
+    driver:
+      image: dokken/fedora-latest
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: ubuntu-14.04
+    driver:
+      image: dokken/ubuntu-14.04
+      pid_one_command: /sbin/init
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update
+
+  - name: ubuntu-16.04
+    driver:
+      image: dokken/ubuntu-16.04
+      pid_one_command: /bin/systemd
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update
+
+  - name: ubuntu-18.04
+    driver:
+      image: dokken/ubuntu-18.04
+      pid_one_command: /bin/systemd
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update
+
+  - name: opensuse-leap
+    driver:
+      image: dokken/opensuse-leap
+      pid_one_command: /bin/systemd
diff --git a/.kitchen.yml → kitchen.yml b/.kitchen.yml → kitchen.yml
@@ -1,3 +1,4 @@
+---
 driver:
   name: vagrant
 
@@ -28,5 +29,5 @@ suites:
    run_list:
    - recipe[test::default]
    attributes:
-      oink_code: <%= ENV['SNORT_LICENCE'] %>
-      community_rules_url: <%= ENV['COMMUNITY_URL'] %>
+      # oink_code: <%= ENV['SNORT_LICENCE'] %>
+      # community_rules_url: <%= ENV['COMMUNITY_URL'] %>
diff --git a/resources/config.rb b/resources/config.rb
@@ -13,10 +13,10 @@
 
 property :decoder_config, Array, default: ['disable_decode_alerts', 'disable_tcpopt_experimental_alerts', 'disable_tcpopt_obsolete_alerts', 'disable_tcpopt_ttcp_alerts', 'disable_tcpopt_alerts', 'disable_ipopt_alerts', 'checksum_mode: all']
 property :detection_config, Hash, default: {
-  'config pcre_match_limit' => '3500',
+  'config pcre_match_limit' =>            '3500',
   'config pcre_match_limit_recursion' =>  '1500',
-  'config detection' => 'search-method ac-split search-optimize max-pattern-len 20',
-  'config event_queue' => 'max_queue 8 log 5 order_events content_length',
+  'config detection' =>                   'search-method ac-split search-optimize max-pattern-len 20',
+  'config event_queue' =>                 'max_queue 8 log 5 order_events content_length',
 }
 property :perfprofiling_config, Hash, default: {}
 property :paf_max, String, default: '16000'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,7 +10,6 @@ The master branch is the current committed changes. These changes may not yet be

		All releases are tagged in git. To see the releases available to you see the changelog or the tags directly.


		## Pull requests

		- <https://github.com/sous-chefs/snort/pulls>
Expand Down