Add Gemfile and puppet 4 checks
In anticipation of puppet 4, start trying to deal with puppet 4 things that can be helpfully predicted by puppet lint plugins. Change-Id: Id272e95c5f93e07b5ab7791badc635eb066c6763 Co-Authored-By: Colleen Murphy <colleen@gazlene.net> Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
6026961606
commit
37727e4b45
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
Gemfile.lock
|
||||
.bundled_gems/
|
31
Gemfile
Normal file
31
Gemfile
Normal file
@ -0,0 +1,31 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
group :development, :test do
|
||||
gem 'puppetlabs_spec_helper', :require => false
|
||||
|
||||
gem 'metadata-json-lint'
|
||||
# This is nice and all, but let's not worry about it until we've actually
|
||||
# got puppet 4.x sorted
|
||||
# gem 'puppet-lint-param-docs'
|
||||
gem 'puppet-lint-absolute_classname-check'
|
||||
gem 'puppet-lint-absolute_template_path'
|
||||
gem 'puppet-lint-trailing_newline-check'
|
||||
|
||||
# Puppet 4.x related lint checks
|
||||
gem 'puppet-lint-unquoted_string-check'
|
||||
gem 'puppet-lint-empty_string-check'
|
||||
gem 'puppet-lint-leading_zero-check'
|
||||
gem 'puppet-lint-variable_contains_upcase'
|
||||
gem 'puppet-lint-numericvariable'
|
||||
gem 'puppet-lint-spaceship_operator_without_tag-check'
|
||||
gem 'puppet-lint-undef_in_function-check'
|
||||
|
||||
if puppetversion = ENV['PUPPET_GEM_VERSION']
|
||||
gem 'puppet', puppetversion, :require => false
|
||||
else
|
||||
gem 'puppet', '~> 3.0', :require => false
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
# vim:ft=ruby
|
@ -2,12 +2,12 @@ class exim(
|
||||
$mailman_domains = [],
|
||||
$queue_interval = '30m',
|
||||
$queue_run_max = '5',
|
||||
$queue_smtp_domains = '',
|
||||
$queue_smtp_domains = undef,
|
||||
$smarthost = false,
|
||||
$sysadmins = []
|
||||
) {
|
||||
|
||||
include exim::params
|
||||
include ::exim::params
|
||||
|
||||
package { $::exim::params::package:
|
||||
ensure => present,
|
||||
@ -40,13 +40,14 @@ class exim(
|
||||
}
|
||||
}
|
||||
|
||||
service { 'exim':
|
||||
ensure => running,
|
||||
name => $::exim::params::service_name,
|
||||
hasrestart => true,
|
||||
subscribe => [File[$::exim::params::config_file],
|
||||
File[$::exim::params::sysdefault_file]],
|
||||
require => Package[$::exim::params::package],
|
||||
service { $::exim::params::service_name:
|
||||
ensure => running,
|
||||
hasrestart => true,
|
||||
subscribe => [
|
||||
File[$::exim::params::config_file],
|
||||
File[$::exim::params::sysdefault_file],
|
||||
],
|
||||
require => Package[$::exim::params::package],
|
||||
}
|
||||
|
||||
file { $::exim::params::config_file:
|
||||
|
Loading…
x
Reference in New Issue
Block a user