diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 9a8f10f3f..203180de0 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.16.0 +current_version = 0.16.1 commit = False tag = False tag_name = {new_version} diff --git a/CHANGELOG.md b/CHANGELOG.md index 23e51b6d6..628fa9b3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ ## Changelog +### 0.16.1 + +**Commit Delta**: [Change from 0.16.0 release](https://github.com/plus3it/watchmaker/compare/0.16.0...0.16.1) + +**Released**: 2019.06.21 + +**Summary**: + +* join-domain-formula + - Updates find-collision.sh ldap search to include uppercase and lowercase versions of provided hostname +* scap-formula + - Adds script to build OSCAP content with 'stig' profile included for CentOS + - Updates OSCAP content to v0.1.44 +* watchmaker-salt-content + - Switches Linux scap profile pillar settings to 'stig' + ### 0.16.0 **Commit Delta**: [Change from 0.15.2 release](https://github.com/plus3it/watchmaker/compare/0.15.2...0.16.0) diff --git a/README.md b/README.md index e4ecd0d39..478805ce6 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ [![Travis CI Build Status](https://travis-ci.org/plus3it/watchmaker.svg?branch=develop)](https://travis-ci.org/plus3it/watchmaker) [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/plus3it/watchmaker?branch=develop&svg=true)](https://ci.appveyor.com/project/plus3it/watchmaker) [![Latest Version](https://img.shields.io/pypi/v/watchmaker.svg?label=version)](https://pypi.python.org/pypi/watchmaker) +[![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge) # Watchmaker diff --git a/docs/conf.py b/docs/conf.py index c484c2a94..54f65fe43 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,7 +52,7 @@ autoclass_content = 'class' autodoc_member_order = 'bysource' -autodoc_default_flags = ['members', 'show-inheritance'] +autodoc_default_options = {'members': True, 'show-inheritance': True} napoleon_use_param = False diff --git a/docs/findings/el7.md b/docs/findings/el7.md index 53b368163..7ca14fb0c 100644 --- a/docs/findings/el7.md +++ b/docs/findings/el7.md @@ -64,7 +64,7 @@ Some scanners implement an "intentional fail" for this audit-item. This is desig This automation has the underlying assumption that all RPM-managed SUID files — be it by the OS vendor or the provider of the software _hosted by_ the OS — is implicitly authorized. A way to quickly-verify compliance with this assumption is to execute: -~~~ +~~~bash for SUID in $( find / -user root -perm -4000 -print 2> /dev/null ) do printf "%s: " "${SUID}" diff --git a/docs/usage.md b/docs/usage.md index d2df44453..f5d48e8e0 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -231,7 +231,7 @@ Variables can be input interactively via the Terraform console or directly to the Terraform module. An example Terraform file that calls the `lx-autoscale` module is shown below. -``` +```terraform provider "aws" {} module "test-lx-instance" { diff --git a/requirements/check.txt b/requirements/check.txt index 87c087aa4..e498d54d3 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -1,4 +1,4 @@ -check-manifest==0.38 +check-manifest==0.39 flake8==3.7.7 flake8-bugbear==19.3.0 flake8-builtins==1.4.1 @@ -6,10 +6,10 @@ flake8-docstrings==1.3.0 flake8-isort==2.7.0 flake8-future-import==0.4.5 flake8-print==3.1.0 -isort==4.3.18 +isort==4.3.20 m2r==0.2.1 pep8-naming==0.8.2 pydocstyle==3.0.0 -pygments==2.4.0 +pygments==2.4.2 pylint==2.3.1 readme-renderer==24.0 diff --git a/requirements/docs.txt b/requirements/docs.txt index 150676973..9c19c58fa 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,4 +1,4 @@ m2r==0.2.1 setuptools==41.0.1 -sphinx==2.0.1 +sphinx==2.1.2 sphinx-rtd-theme==0.4.3 diff --git a/requirements/test.txt b/requirements/test.txt index dfa17d73c..f75b68369 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,7 +1,7 @@ mock==2.0.0;python_version=="2.6" # pyup: ==2.0.0 mock==3.0.5;python_version>="2.7" pytest==3.2.5;python_version=="2.6" or python_version=="3.3" # pyup: ==3.2.5 -pytest==4.4.2;python_version=="2.7" or python_version>="3.4" +pytest==4.6.3;python_version=="2.7" or python_version>="3.4" pytest-travis-fold==1.3.0 pytest-catchlog==1.2.2;python_version=="2.6" pytest-cov==2.5.1;python_version=="2.6" # pyup: ==2.5.1 diff --git a/setup.cfg b/setup.cfg index 9a9766963..c94464fae 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,7 +3,7 @@ [metadata] name = watchmaker description = Applied Configuration Management -version = 0.16.0 +version = 0.16.1 author = Plus3IT Maintainers of Watchmaker author_email = projects@plus3it.com url = https://github.com/plus3it/watchmaker diff --git a/src/watchmaker/static/salt/content b/src/watchmaker/static/salt/content index e70b56cd0..156cfaa74 160000 --- a/src/watchmaker/static/salt/content +++ b/src/watchmaker/static/salt/content @@ -1 +1 @@ -Subproject commit e70b56cd0600ad74f12ef75fe64e8188c2b9d848 +Subproject commit 156cfaa741ca28331dfe8c5edb692e2e2639bc72 diff --git a/src/watchmaker/static/salt/formulas/join-domain-formula b/src/watchmaker/static/salt/formulas/join-domain-formula index a9acd1233..c2795f880 160000 --- a/src/watchmaker/static/salt/formulas/join-domain-formula +++ b/src/watchmaker/static/salt/formulas/join-domain-formula @@ -1 +1 @@ -Subproject commit a9acd1233a96f1904bffb67d504191a7c1252a05 +Subproject commit c2795f880c67b4778d5b3af25d1c7e90c3fb5353 diff --git a/src/watchmaker/static/salt/formulas/scap-formula b/src/watchmaker/static/salt/formulas/scap-formula index 91cb286f7..62c09292b 160000 --- a/src/watchmaker/static/salt/formulas/scap-formula +++ b/src/watchmaker/static/salt/formulas/scap-formula @@ -1 +1 @@ -Subproject commit 91cb286f7465efac8c091d44d37e8ef6a8e84793 +Subproject commit 62c09292b0fcd11c74e541d60574559a38b56cf8