(SIMP-3476) rsyslog: Allow custom content for local and remote rules (#…

…61)

- Add ability to specify full rule content for rsyslog::rule::local
  and rsyslog::rule::remote defined types. This capability for
  local rules is needed by pupmod-simp-simp_rsyslog.
- Fixed minor bug in which ioBufferSize parameter was listed twice
  in the rsyslog rule generated by rsyslog::rule::local.
- Fix puppet lint issues
- Fix puppet strings issues
- Updated to simp-rake-helpers 4
- Updated README

SIMP-3476 #close

.travis.yml

@@ -13,7 +13,10 @@ cache: bundler
 before_script:
   - bundle update
 bundler_args: --without development system_tests --path .vendor
-before_install: rm Gemfile.lock || true
+before_install: 
+  - rm Gemfile.lock || true
+  - rvm @global do gem uninstall bundler -a -x
+  - rvm @global do gem install bundler -v '~> 1.14.0'
 script:
   - bundle exec rake test
 notifications:

CHANGELOG

@@ -1,3 +1,9 @@
+* Mon Jul 31 2017 Liz Nemsick <[email protected]> - 7.1.0-0
+- Add ability to specify full rule content for rsyslog::rule::local
+  and rsyslog::rule::remote defined types.
+- Fixed bug in which ioBufferSize parameter was listed twice
+  in the rsyslog rule generated by rsyslog::rule::local.
+
 * Fri May 26 2017 Liz Nemsick <[email protected]> - 7.0.3-0
 - Fixed bug in which default iptables rsyslog rule did not work
   with rsyslog version 7.4.7.  Some versions of rsyslog include

Gemfile

@@ -16,8 +16,8 @@ group :test do
   gem 'puppet-strings'
   gem 'puppet-lint-empty_string-check',   :require => false
   gem 'puppet-lint-trailing_comma-check', :require => false
-  gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', '~> 1.3')
-  gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', '~> 3.5')
+  gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', '~> 2.0')
+  gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', '~> 4.0')
 end
 
 group :development do

README.md

@@ -1,9 +1,11 @@
 #pupmod-simp-rsyslog
-[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
-[![Build
-Status](https://travis-ci.org/simp/pupmod-simp-rsyslog.svg)](https://travis-ci.org/simp/pupmod-simp-rsyslog)
-[![SIMP
-compatibility](https://img.shields.io/badge/SIMP%20compatibility-4.2.*%2F5.1.*-orange.svg)](https://img.shields.io/badge/SIMP%20compatibility-4.2.*%2F5.1.*-orange.svg)
+
+[![License](https://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/73/badge)](https://bestpractices.coreinfrastructure.org/projects/73)
+[![Puppet Forge](https://img.shields.io/puppetforge/v/simp/rsyslog.svg)](https://forge.puppetlabs.com/simp/rsyslog)
+[![Puppet Forge Downloads](https://img.shields.io/puppetforge/dt/simp/rsyslog.svg)](https://forge.puppetlabs.com/simp/rsyslog)
+[![Build Status](https://travis-ci.org/simp/pupmod-simp-rsyslog.svg)](https://travis-ci.org/simp/pupmod-simp-rsyslog)
+
 
 #### Table of Contents
 
@@ -36,21 +38,12 @@ guarantees made about backwards compatibility.
 ## This is a SIMP module
 
 This module is a component of the
-[System Integrity Management
-Platform](https://github.com/NationalSecurityAgency/SIMP),
+[System Integrity Management Platform](https://simp-project.com),
 a compliance-management framework built on Puppet.
 
 If you find any issues, they can be submitted to our
 [JIRA](https://simp-project.atlassian.net/).
 
-Please read our
-[Contribution
-Guide](https://simp-project.atlassian.net/wiki/display/SD/Contributing+to+SIMP)
-and visit our
-[developer
-wiki](https://simp-project.atlassian.net/wiki/display/SD/SIMP+Development+Home).
-
-
 ## Module Description
 
 This module follows the standard
@@ -183,8 +176,6 @@ would put ``prifilt('kern.err')`` in your ``rule`` paramter.
 This does **not** hold for a call to ``rsyslog::rule`` since that is the
 generic processor for all rules.
 
-See the documentation in the module [Docs Folder](doc/index.html) for details.
-
 ```puppet
 class my_rsyslog_client {
   class {'rsyslog':
@@ -277,29 +268,9 @@ rsyslog::rule::remote { 'upstream':
 
 ## Reference
 
-Classes for pupmod-simp-rsyslog:
-* [rsyslog](https://github.com/simp/pupmod-simp-rsyslog/tree/master/manifests/init.pp)
-* [rsyslog::params](https://github.com/simp/pupmod-simp-rsyslog/tree/master/manifests/params.pp)
-* [rsyslog::install](https://github.com/simp/pupmod-simp-rsyslog/tree/master/manifests/install.pp)
-* [rsyslog::config](https://github.com/simp/pupmod-simp-rsyslog/tree/master/manifests/config.pp)
-* [rsyslog::config::logging](https://github.com/simp/pupmod-simp-rsyslog/tree/master/manifests/config/logging.pp)
-* [rsyslog::config::pki](https://github.com/simp/pupmod-simp-rsyslog/tree/master/manifests/config/pki.pp)
-* [rsyslog::service](https://github.com/simp/pupmod-simp-rsyslog/tree/master/manifests/service.pp)
-* [rsyslog::server](https://github.com/simp/pupmod-simp-rsyslog/tree/master/manifests/server.pp)
-* [rsyslog::server::firewall](https://github.com/simp/pupmod-simp-rsyslog/tree/master/manifests/server/firewall.pp)
-* [rsyslog::server::selinux](https://github.com/simp/pupmod-simp-rsyslog/tree/master/manifests/server/selinux.pp)
-* [rsyslog::server::tcpwrappers](https://github.com/simp/pupmod-simp-rsyslog/tree/master/manifests/server/tcpwrappers.pp)
-
-Defines for pupmod-simp-rsyslog:
-* [rsyslog::rule::console](https://github.com/simp/pupmod-simp-rsyslog/tree/manifests/rule/console.pp)
-* [rsyslog::rule::drop](https://github.com/simp/pupmod-simp-rsyslog/tree/manifests/rule/drop.pp)
-* [rsyslog::rule::local](https://github.com/simp/pupmod-simp-rsyslog/tree/manifests/rule/local.pp)
-* [rsyslog::rule::other](https://github.com/simp/pupmod-simp-rsyslog/tree/manifests/rule/other.pp)
-* [rsyslog::rule::remote](https://github.com/simp/pupmod-simp-rsyslog/tree/manifests/rule/remote.pp)
-* [rsyslog::template::list](https://github.com/simp/pupmod-simp-rsyslog/tree/manifests/template/list.pp)
-* [rsyslog::template::plugin](https://github.com/simp/pupmod-simp-rsyslog/tree/manifests/template/plugin.pp)
-* [rsyslog::template::string](https://github.com/simp/pupmod-simp-rsyslog/tree/manifests/template/string.pp)
-* [rsyslog::template::subtree](https://github.com/simp/pupmod-simp-rsyslog/tree/manifests/template/subtree.pp)
+The full module reference can be found in the
+[module docs](https://simp.github.io/pupmod-simp-rsyslog) and in the local
+`docs/` directory.
 
 ## Limitations
 
@@ -313,12 +284,10 @@ strategy for failover as it may cause undesirable results such as lost logs.
 
 ## Development
 
-Please see the
-[SIMP Contribution
-Guidelines](https://simp-project.atlassian.net/wiki/display/SD/Contributing+to+SIMP).
+Please read our [Contribution Guide](http://simp.readthedocs.io/en/master/contributors_guide/index.html)
+and visit our [Developer Wiki](https://simp-project.atlassian.net/wiki/display/SD/SIMP+Development+Home)
+
+If you find any issues, they can be submitted to our
+[JIRA](https://simp-project.atlassian.net).
 
-General developer documentation can be found on
-[Confluence](https://simp-project.atlassian.net/wiki/display/SD/SIMP+Development+Home).
-Visit the project homepage on [GitHub](https://simp-project.com),
-chat with us on our [HipChat](https://simp-project.hipchat.com/),
-and look at our issues on  [JIRA](https://simp-project.atlassian.net/).
+[System Integrity Management Platform](https://simp-project.com)

doc/_index.html → docs/_index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>
-  Documentation by YARD 0.9.5
+  Documentation by YARD 0.9.9
 
 </title>
 
@@ -26,7 +26,7 @@
   </head>
   <body>
     <div class="nav_wrap">
-      <iframe id="nav" src="puppet_class_list.html"></iframe>
+      <iframe id="nav" src="puppet_class_list.html?1"></iframe>
       <div id="resizer"></div>
     </div>
 
@@ -52,9 +52,7 @@
         <div class="clear"></div>
       </div>
 
-      <iframe id="search_frame" src="puppet_class_list.html"></iframe>
-
-      <div id="content"><h1 class="noborder title">Documentation by YARD 0.9.5</h1>
+      <div id="content"><h1 class="noborder title">Documentation by YARD 0.9.9</h1>
 <div id="listing">
   <h1 class="alphaindex">Alphabetic Index</h1>
 
@@ -85,11 +83,6 @@ <h2>Puppet Class Listing A-Z</h2>
 
             </li>
 
-            <li>
-      <span class='object_link'><a href="puppet_classes/rsyslog_3A_3Aconfig_3A_3Apki.html" title="puppet_classes::rsyslog::config::pki (puppet_class)">rsyslog::config::pki</a></span>
-
-            </li>
-
             <li>
       <span class='object_link'><a href="puppet_classes/rsyslog_3A_3Ainstall.html" title="puppet_classes::rsyslog::install (puppet_class)">rsyslog::install</a></span>
 
@@ -228,9 +221,9 @@ <h2>File Listing</h2>
 </div>
 
       <div id="footer">
-  Generated on Fri Dec 16 12:55:44 2016 by
+  Generated on Tue Aug  1 16:10:53 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.5 (ruby-2.1.10).
+  0.9.9 (ruby-2.1.9).
 </div>
 
     </div>