Skip to content

Commit

Permalink
cleanup whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
ajjahn committed Dec 3, 2015
1 parent 691ac13 commit 6a32021
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ dns::server::options { '/etc/bind/named.conf.options':
node default {
# Other nodes export an A record for their hostname
@@dns::record::a { $::hostname:
zone => $::domain,
zone => $::domain,
data => $::ipaddress,
}
}
Expand Down
8 changes: 4 additions & 4 deletions spec/classes/dns__server__install_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,22 @@
context "on a RedHat OS with default params" do
let(:facts) {{ :osfamily => 'RedHat' }}
it { should contain_class('dns::server::params') }
it do
it do
should contain_package('bind').with({
'ensure' => 'latest',
})
end
end

context "on a RedHat OS with non-default params" do
let(:facts) {{ :osfamily => 'RedHat' }}
let(:params) {{ :ensure_packages => 'present' }}
it { should contain_class('dns::server::params') }
it do
it do
should contain_package('bind').with({
'ensure' => 'present',
})
end
end

end
end
6 changes: 3 additions & 3 deletions templates/default.debian.erb
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# run resolvconf?
<% if @resolvconf -%>
RESOLVCONF=<%= @resolvconf %>
<% else %>
<% else %>
RESOLVCONF=no
<% end -%>

# startup options for the server
<% if @options -%>
OPTIONS="<%= @options %>"
<% else %>
<% else %>
OPTIONS="-u bind"
<% end -%>
<% end -%>
4 changes: 2 additions & 2 deletions templates/zone_record.erb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<%
<%
delimiter = %w[TXT SPF].include?(@record.upcase) ? '"' : ''
data_a = @data.is_a?(String) ? @data.lines.to_a : @data

data_a.each do |data_item|
data_a.each do |data_item|
-%>
<%= @host %> <%= @ttl %> <%= @dns_class %> <%= @record.upcase %><%= @record.upcase == 'MX' ? " #{@preference}" : '' %> <%= delimiter %><%= data_item %><%= delimiter %>
<% end -%>

0 comments on commit 6a32021

Please sign in to comment.