Add all pull requests to one request

.fixtures.yaml

@@ -0,0 +1,3 @@
+fixtures:
+  repositories:
+   'stdlib': "git://github.com/puppetlabs/puppetlabs-stdlib.git"

.gitignore

@@ -1,3 +1,3 @@
 .bundle/
-vendor/gems/
+vendor/
 .ruby-version

.travis.yml

@@ -7,7 +7,6 @@ notifications:
   email:
     - [email protected]
 env:
-  - PUPPET_VERSION=2.6.18
   - PUPPET_VERSION=2.7.24
   - PUPPET_VERSION=3.0.2
   - PUPPET_VERSION=3.1.1

Gemfile

@@ -4,4 +4,5 @@ puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>=
 
 gem 'puppet-lint'
 gem 'rspec-puppet'
+gem 'puppetlabs_spec_helper'
 gem 'puppet', puppetversion

Gemfile.lock

@@ -6,15 +6,24 @@ GEM
     hiera (1.2.1)
       json_pure
     json_pure (1.8.0)
-    metaclass (0.0.1)
-    mocha (0.14.0)
+    metaclass (0.0.4)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
     puppet (3.2.1)
       facter (~> 1.6)
       hiera (~> 1.0)
       rgen (~> 0.6)
     puppet-lint (0.3.2)
-    rake (10.0.4)
+    puppet-syntax (1.3.0)
+      rake
+    puppetlabs_spec_helper (0.8.2)
+      mocha
+      puppet-lint
+      puppet-syntax
+      rake
+      rspec
+      rspec-puppet
+    rake (10.4.1)
     rgen (0.6.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -33,4 +42,5 @@ PLATFORMS
 DEPENDENCIES
   puppet (>= 3.2)
   puppet-lint
+  puppetlabs_spec_helper
   rspec-puppet

Modulefile

@@ -1,7 +1,7 @@
-name 'rodjek-logrotate'
-version '1.1.1'
-source 'https://github.com/rodjek/puppet-logrotate'
+name 'b4ldr-logrotate'
+version '1.1.4'
+source 'https://github.com/b4ldr/puppet-logrotate'
 license 'MIT'
 summary 'Logrotate module'
-description 'Manage logrotate on your servers with Puppet'
-project_page 'https://github.com/rodjek/puppet-logrotate'
+description 'Manage logrotate on your servers with Puppet, update of https://github.com/rodjek/puppet-logrotate adding outstanding merges'
+project_page 'https://github.com/b4ldr/puppet-logrotate'

README.md

@@ -1,6 +1,10 @@
 # Logrotate module for Puppet
 
-[![Build Status](https://secure.travis-ci.org/rodjek/puppet-logrotate.png)](http://travis-ci.org/rodjek/puppet-logrotate)
+## Disclaimer 
+
+This module is a fork of https://github.com/rodjek/puppet-logrotate merging some of the outstanding pull requests
+
+## Description  
 
 A more Puppety way of managing logrotate configs.  Where possible, as many of
 the configuration options have remained the same with a couple of notable
@@ -13,6 +17,13 @@ exceptions:
  * Instead of 'daily', 'weekly', 'monthly' or 'yearly', there is a
    `rotate_every` parameter (see documentation below).
 
+## logrotate::conf
+
+You may, optionally, define logrotate defaults using this defined type.
+Parameters are the same as those for logrotate::rule.
+Using this type will automatically include a private class that will install
+and configure logrotate for you.
+
 ## logrotate::rule
 
 The only thing you'll need to deal with, this type configures a logrotate rule.
@@ -32,7 +43,7 @@ compressext     - The extention String to be appended to the rotated log files
                   after they have been compressed (optional).
 compressoptions - A String of command line options to be passed to the
                   compression program specified in `compresscmd` (optional).
-copy            - A Boolean specifying whether logrotate should just take a 
+copy            - A Boolean specifying whether logrotate should just take a
                   copy of the log file and not touch the original (optional).
 copytruncate    - A Boolean specifying whether logrotate should truncate the
                   original log file after taking a copy (optional).
@@ -56,7 +67,7 @@ extension       - Log files with this extension String are allowed to keep it
                   after rotation (optional).
 ifempty         - A Boolean specifying whether the log file should be rotated
                   even if it is empty (optional).
-mail            - The email address String that logs that are about to be 
+mail            - The email address String that logs that are about to be
                   rotated out of existence are emailed to (optional).
 mailfirst       - A Boolean that when used with `mail` has logrotate email the
                   just rotated file rather than the about to expire file
@@ -74,17 +85,17 @@ missingok       - A Boolean specifying whether logrotate should ignore missing
                   log files or issue an error (optional).
 olddir          - A String path to a directory that rotated logs should be
                   moved to (optional).
-postrotate      - A command String or an Array of Strings that should be
-                  executed by /bin/sh after the log file is rotated (optional).
-prerotate       - A command String or an Array of Strings that should be
-                  executed by /bin/sh before the log file is rotated and only
-                  if it will be rotated (optional).
-firstaction     - A command String or an Array of Strings that should be
-                  executed by /bin/sh once before all log files that match the
-                  wildcard pattern are rotated (optional).
-lastaction      - A command String or an Array of Strings that should be
-                  executed by /bin/sh once after all the log files that match
-                  the wildcard pattern are rotated (optional).
+postrotate      - A command String that should be executed by /bin/sh after
+                  the log file is rotated (optional).
+prerotate       - A command String that should be executed by /bin/sh before
+                  the log file is rotated and only if it will be rotated
+                  (optional).
+firstaction     - A command String that should be executed by /bin/sh once
+                  before all log files that match the wildcard pattern are
+                  rotated (optional).
+lastaction      - A command String that should be execute by /bin/sh once
+                  after all the log files that match the wildcard pattern are
+                  rotated (optional).
 rotate          - The Integer number of rotated log files to keep on disk
                   (optional).
 rotate_every    - How often the log files should be rotated as a String.
@@ -94,7 +105,7 @@ rotate_every    - How often the log files should be rotated as a String.
 size            - The String size a log file has to reach before it will be
                   rotated (optional).  The default units are bytes, append k,
                   M or G for kilobytes, megabytes or gigabytes respectively.
-sharedscripts   - A Boolean specifying whether logrotate should run the 
+sharedscripts   - A Boolean specifying whether logrotate should run the
                   postrotate and prerotate scripts for each matching file or
                   just once (optional).
 shred           - A Boolean specifying whether logs should be deleted with
@@ -121,6 +132,13 @@ Further details about these options can be found by reading `man 8 logrotate`.
 ### Examples
 
 ```
+logrotate::conf { '/etc/logrotate.conf':
+  rotate       => 10,
+  rotate_every => 'week',
+  ifempty      => true,
+  dateext      => true,
+}
+
 logrotate::rule { 'messages':
   path         => '/var/log/messages',
   rotate       => 5,