Skip to content

Commit 6e56c07

Browse files
committed
Merge pull request redhat-openstack#232 from jamesdobson/bug/master/invalid_logfile_parameter
Fixing logfile parameter.
2 parents 3de8b3b + 3a4342e commit 6e56c07

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

README.markdown

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,10 @@ Which of the keys is the request key.
190190

191191
Array of trusted keys.
192192

193+
#### `logfile`
194+
195+
Absolute path of the alternate log file. If unspecified, ntp uses syslog by default.
196+
193197
####`package_ensure`
194198

195199
Sets the ntp package to be installed. Can be set to 'present', 'latest', or a specific version.

spec/classes/ntp_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226

227227
it 'should contain logfile setting' do
228228
should contain_file('/etc/ntp.conf').with({
229-
'content' => /^logfile = \/var\/log\/foobar\.log\n/,
229+
'content' => /^logfile \/var\/log\/foobar\.log\n/,
230230
})
231231
end
232232
end
@@ -238,7 +238,7 @@
238238

239239
it 'should not contain a logfile line' do
240240
should_not contain_file('/etc/ntp.conf').with({
241-
'content' => /logfile =/,
241+
'content' => /logfile /,
242242
})
243243
end
244244
end

templates/ntp.conf.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ driftfile <%= @driftfile %>
4444

4545
<% unless @logfile.nil? -%>
4646
# Logfile
47-
logfile = <%= @logfile %>
47+
logfile <%= @logfile %>
4848
<% end -%>
4949

5050
<% if @keys_enable -%>

0 commit comments

Comments
 (0)