1
0
mirror of https://github.com/krislamo/puppet-fluentd synced 2025-09-13 08:59:29 +00:00

6 Commits
0.1.0 ... 0.3.0

Author SHA1 Message Date
Jan Krause
b5d8088d31 prepare 0.3.0 release 2015-12-09 16:06:00 +01:00
Jan Krause
31a92b59eb pin dependency modules in fixtures
also increases apt dependency
2015-12-09 16:04:47 +01:00
Jan Krause
641873546f minor changes 2015-12-09 16:04:28 +01:00
Jan Krause
a08cd1f4f4 change travis build notification 2015-12-09 14:24:28 +01:00
Max Wilhelm
428a220e1f increased stdlib dependency 2015-12-08 11:50:23 +01:00
Max Wilhelm
5a67bcac9a added version badge to README.md 2015-12-07 18:51:12 +01:00
10 changed files with 31 additions and 16 deletions

View File

@@ -1,6 +1,10 @@
fixtures: fixtures:
repositories: repositories:
apt: "https://github.com/puppetlabs/puppetlabs-apt.git" apt:
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git" repo: "https://github.com/puppetlabs/puppetlabs-apt.git"
ref: "2.0.0"
stdlib:
repo: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
ref: "4.6.0"
symlinks: symlinks:
fluentd: "#{source_dir}" fluentd: "#{source_dir}"

View File

@@ -1,8 +1,8 @@
---
sudo: false sudo: false
language: ruby language: ruby
bundler_args: --without system_tests bundler_args: --without system_tests
script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'" script: bundle exec rake validate && bundle exec rake lint && bundle exec rake spec
SPEC_OPTS='--format documentation'
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
@@ -13,4 +13,5 @@ matrix:
- rvm: 2.1.6 - rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes" env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
notifications: notifications:
email: max.wilhelm@wywy.com slack:
secure: WVBx/OJqLpX9WXyiejEdnOcAf+5ShWJ2gcyeBCX032iKzPphcdPKqH+jnlFaKjqQCZARbRqzlj/if3FZWAlhWtTrWrcY545dRHcsaGvJ/nMtdHlBUuwUNHipSn+RTXtorsYz0efhJMPye2LMl0HgAp3rEs70XUt8rZOwdedLGVgfWRwM+KixhSf8P08v9QjNRNdhWII37KFRdqv/NHryNlVKsTLH6fQOyIvok3vrTvMR8rWMRETXv6JLpCJ3FfOrxo53fW7q+GlXXuVcQ2OGlgxm3eke6q2aXZAqczeB5CSlWgUEA5T3rQ//WI3enwTayRajV/9O26HZvASjSTnDRiSSv1itYqg1Uy6kuJy5ANpBizOyWY6/QTM5Rw00AXvaY9ur0EmyNe5vLNHyTxzdr4R+rXjE07yCDvWM9RGbu+4BipP+mAoJTkuCIP54FWYn1qOJnC8DYywD/+wniCNLbp6yMgbG/aC6H5RmuSy+3xRoEbwvyXKUgA+4gL3I3aAIvidBG+yazRBFvRCn4pUJdTEc4Cpu0jhQWXWyZSE66HNPKyIOXl9JPTzul08MDo9OaqBt+K3yeMVA8EPr196mWLwerF+dExQ2PJhUu/7MAiOgFrIr4/d05iKhj4ivLYBRNN317s2NVo8qyfhPHlfv6PyzhllC/qjClQ2rLOemVhg=

View File

@@ -1,4 +1,12 @@
# Changelog # Changelog
## 0.3.0
* Increased apt dependency
* Module pinning on rspec tests
* Minor changes
## 0.2.0
* Increased stdlib dependency
## 0.1.0 ## 0.1.0
Initial release * Initial release

View File

@@ -1,7 +1,10 @@
# wywygmbh/fluentd Puppet Module # wywygmbh/fluentd Puppet Module
[![GitHub version](https://badge.fury.io/gh/wywygmbh%2Fpuppet-fluentd.svg)](https://github.com/wywygmbh/puppet-fluentd)
[![Build Status](https://travis-ci.org/wywygmbh/puppet-fluentd.svg?branch=master)](https://travis-ci.org/wywygmbh/puppet-fluentd) [![Build Status](https://travis-ci.org/wywygmbh/puppet-fluentd.svg?branch=master)](https://travis-ci.org/wywygmbh/puppet-fluentd)
#### Table of Contents #### Table of Contents
1. [Description](#description) 1. [Description](#description)

View File

@@ -1,4 +1,4 @@
# Configure package # Configure config files/directories
# #
class fluentd::config inherits fluentd { class fluentd::config inherits fluentd {
@@ -16,5 +16,4 @@ class fluentd::config inherits fluentd {
group => $::fluentd::user_group, group => $::fluentd::user_group,
mode => '0750', mode => '0750',
} }
} }

View File

@@ -64,6 +64,7 @@ class fluentd (
validate_bool($service_manage) validate_bool($service_manage)
validate_string($service_name) validate_string($service_name)
validate_bool($service_enable) validate_bool($service_enable)
if ! ($service_ensure in [ 'running', 'stopped' ]) { if ! ($service_ensure in [ 'running', 'stopped' ]) {
fail('service_ensure parameter must be running or stopped') fail('service_ensure parameter must be running or stopped')
} }
@@ -79,5 +80,4 @@ class fluentd (
Class['::Fluentd::Install'] -> Class['::Fluentd::Install'] ->
Class['::Fluentd::Config'] -> Class['::Fluentd::Config'] ->
Class['::Fluentd::Service'] Class['::Fluentd::Service']
} }

View File

@@ -40,7 +40,7 @@ define fluentd::plugin (
'gem': { 'gem': {
fluentd::plugin::gem { $name: fluentd::plugin::gem { $name:
ensure => $ensure, ensure => $ensure,
require => Class['Fluentd::Install'] require => Class['Fluentd::Install'],
} }
} }
'file': { 'file': {
@@ -49,7 +49,7 @@ define fluentd::plugin (
fluentd::plugin::file { $name: fluentd::plugin::file { $name:
ensure => $ensure, ensure => $ensure,
source => $source, source => $source,
require => Class['Fluentd::Install'] require => Class['Fluentd::Install'],
} }
} }
default: { default: {

View File

@@ -11,6 +11,6 @@ define fluentd::plugin::gem (
package { $name: package { $name:
ensure => $ensure, ensure => $ensure,
provider => 'fluentd_gem', provider => 'fluentd_gem',
notify => Class['Fluentd::Service'] notify => Class['Fluentd::Service'],
} }
} }

View File

@@ -1,4 +1,4 @@
# Configure package # Configure service
# #
class fluentd::service inherits fluentd { class fluentd::service inherits fluentd {

View File

@@ -1,6 +1,6 @@
{ {
"name": "wywygmbh-fluentd", "name": "wywygmbh-fluentd",
"version": "0.1.0", "version": "0.3.0",
"author": "wywy GmbH", "author": "wywy GmbH",
"summary": "Generic module for fluentd (td-agent).", "summary": "Generic module for fluentd (td-agent).",
"license": "Apache-2.0", "license": "Apache-2.0",
@@ -15,8 +15,8 @@
} }
], ],
"dependencies": [ "dependencies": [
{ "name":"puppetlabs-stdlib","version_requirement":">= 1.0.0" }, { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.6.0 < 5.0.0" },
{ "name": "puppetlabs/apt", "version_requirement": ">= 1.8.0 < 3.0.0" } { "name": "puppetlabs/apt", "version_requirement": ">= 2.0.0 < 3.0.0" }
], ],
"data_provider": null "data_provider": null
} }