Skip to content

Fixes #37 - Template of the init script and take care of the configdir. #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oloc wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Fixes #37 - Template of the init script and take care of the configdir. #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8da953a
Fixes #37 - Template of the init script and take care of the configdir.
Jul 10, 2015
1aa09db
Update Gemfile to convert git into https to avoid RSA Key issue
Jul 16, 2015
9d40004
Update: remove the old Ruby 1.8.7
Jul 16, 2015
bb4d10e
PR #46 - 2a482166dc2ae2357b74e4be44f1751dd3da156e
Jul 20, 2015
1cccf24
Merge branch 'beaker_publickey_issue' into init_script_debian
Jul 21, 2015
5a7d904
Add ensure present in the spec for init.d services.
Jul 21, 2015
1cd14cd
Move init.d file from config to service/init.
Jul 21, 2015
f0355c5
Merge branch '1cd14cd' into init_script_debian
Jul 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: ruby
rvm:
- 1.8.7
- 1.9.3
- 2.0.0
- 2.1
before_install: rm Gemfile.lock || true
script:
- "bundle exec rake lint"
Expand All @@ -15,6 +15,23 @@ env:
- PUPPET_VERSION="~> 3.2.0"
- PUPPET_VERSION="~> 3.3.0"
- PUPPET_VERSION="~> 3.4.0"
- PUPPET_VERSION="~> 3.5.0"
matrix:
allow_failures:
- rvm: 2.0.0
exclude:
- rvm: 1.9.3
env: PUPPET_VERSION="~> 2.7.0"
- rvm: 2.0.0
env: PUPPET_VERSION="~> 2.7.0"
- rvm: 2.0.0
env: PUPPET_VERSION="~> 3.1.0"
- rvm: 2.1
env: PUPPET_VERSION="~> 2.7.0"
- rvm: 2.1
env: PUPPET_VERSION="~> 3.1.0"
- rvm: 2.1
env: PUPPET_VERSION="~> 3.2.0"
- rvm: 2.1
env: PUPPET_VERSION="~> 3.3.0"
- rvm: 2.1
env: PUPPET_VERSION="~> 3.4.0"

4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ source 'https://rubygems.org'
puppetversion = ENV['PUPPET_VERSION'] || '~> 3.7.0'
gem 'puppet', puppetversion, :require => false

gem 'beaker', :git => 'git@github.com:puppetlabs/beaker.git', :branch => 'master'
gem 'beaker-rspec', :git => 'git@github.com:puppetlabs/beaker-rspec.git', :branch => 'master'
gem 'beaker', :git => 'https://github.com/puppetlabs/beaker.git', :branch => 'master'
gem 'beaker-rspec', :git => 'https://github.com/puppetlabs/beaker-rspec.git', :branch => 'master'
gem 'metadata-json-lint', :git => 'https://github.com/nibalizer/metadata-json-lint.git', :branch => 'master'
gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git', :branch => 'master'

Expand Down
2 changes: 1 addition & 1 deletion manifests/repo.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
location => 'http://packages.elasticsearch.org/logstashforwarder/debian',
release => 'stable',
repos => 'main',
key => 'D88E42B4',
key => '46095ACC8548582C1A2699A9D27D666CD88E42B4',
key_source => 'http://packages.elasticsearch.org/GPG-KEY-elasticsearch',
include_src => false,
}
Expand Down
7 changes: 6 additions & 1 deletion manifests/service/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,12 @@
before => Service[$name],
notify => $notify_service
}

}
else {
file { "/etc/init.d/${logstashforwarder::service_name}":
ensure => file,
content => template("${module_name}/etc/init.d/logstashforwarder.Debian.erb"),
}
}

}
Expand Down
2 changes: 2 additions & 0 deletions spec/classes/001_logstashforwarder_init_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@

let (:params) {
default_params.merge({
:ensure => 'present',
:init_template => "logstashforwarder/etc/init.d/logstashforwarder.Debian.erb"
})
}
Expand All @@ -226,6 +227,7 @@

let (:params) {
default_params.merge({
:ensure => 'present',
:init_template => "logstashforwarder/etc/init.d/logstashforwarder.Debian.erb",
:restart_on_change => false
})
Expand Down
Loading