Skip to content

Commit

Permalink
Bind to interface only, if specified
Browse files Browse the repository at this point in the history
Usually when someone specifies an interface to bind, it means
the service is required to bind to that interface instead of all.

Since dnsmasq doesn't bind like that by default, this additional
option is required.

Fixing Gemfile

Fixing rake version in Gemfile

Removing dupe line in Rakefile

Fixing missing dependency

Use newer ruby

Adjust rake version

Drop old puppet, add newest 3.8
  • Loading branch information
Andrian Jardan committed Jul 4, 2017
1 parent faa395f commit a5d6cf6
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
rvm: 1.8.7
rvm: 1.9.3
notifications:
email:
- [email protected]
env:
- PUPPET_VERSION=2.7.11
- PUPPET_VERSION=3.1.1
- PUPPET_VERSION=3.7.0
- PUPPET_VERSION=3.8.7
7 changes: 5 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ source "https://rubygems.org"
puppet_version = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : \
'= 3.7.2' # from puppet enterprise 3.7.0

gem 'rake'
gem 'rspec', '< 3.0.0'
gem 'puppet-lint'
gem 'rspec-puppet'
gem 'puppetlabs_spec_helper'
Expand All @@ -16,4 +14,9 @@ if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
# rake >=11 does not support ruby 1.8.7
gem 'rspec', '~> 2.0'
gem 'rake', '~> 10.0'
gem 'json', '= 1.8'
else
gem 'rspec', '< 3.0.0'
gem 'rake', '< 11.0'
gem 'json'
end
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'rake'
require 'json'

require 'rspec/core/rake_task'
require 'puppet-lint/tasks/puppet-lint'

require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
Expand Down
1 change: 1 addition & 0 deletions templates/dnsmasq.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ listen-address=<%= addr %>
<% end -%>
<% end -%>
<% if @interface -%>
bind-interfaces
<% Array(@interface).compact.each do |iface| -%>
interface=<%= iface %>
<% end -%>
Expand Down

0 comments on commit a5d6cf6

Please sign in to comment.