Skip to content

merge Master back up to 3.1.x #159

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

Merged
merged 8 commits into from
Jun 3, 2014
Merged

merge Master back up to 3.1.x #159

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
240c768
fix documentation - manage_service -> service_manage
Dec 16, 2013
54ec7f9
add parameter to set a log file
darix Feb 7, 2014
c474fd3
only check the log file if it is actually used.
darix Feb 7, 2014
0db1d4f
Merge pull request #152 from apenney/tighten-dependencies
May 14, 2014
aed8d0c
Merge pull request #117 from CpuID/master
cyberious May 15, 2014
f2a41ea
Merge pull request #122 from darix/add_log_file_param
cyberious Jun 3, 2014
f3d9114
Merge branch 'master' into 3.1.x
Jun 3, 2014
198ea79
Fix restrict_spec test
Jun 3, 2014
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
4 changes: 2 additions & 2 deletions README.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class { '::ntp':
class { '::ntp':
servers => [ 'ntp1.corp.com', 'ntp2.corp.com' ],
restrict => ['127.0.0.1'],
manage_service => false,
service_manage => false,
}
```

Expand All @@ -84,7 +84,7 @@ class { '::ntp':
class { '::ntp':
servers => [ 'ntp1.corp.com', 'ntp2.corp.com' ],
restrict => ['127.0.0.1'],
manage_service => false,
service_manage => false,
config_template => 'different/module/custom.template.erb',
}
```
Expand Down
2 changes: 2 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
$config_template = $ntp::params::config_template,
$disable_monitor = $ntp::params::disable_monitor,
$driftfile = $ntp::params::driftfile,
$logfile = $ntp::params::logfile,
$keys_enable = $ntp::params::keys_enable,
$keys_file = $ntp::params::keys_file,
$keys_controlkey = $ntp::params::keys_controlkey,
Expand All @@ -26,6 +27,7 @@
validate_string($config_template)
validate_bool($disable_monitor)
validate_absolute_path($driftfile)
if $logfile { validate_absolute_path($logfile) }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I'm cool with this :(

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Explain? I did run our current system tests against it for our default and ubuntu-server 12042

validate_bool($keys_enable)
validate_re($keys_controlkey, ['^\d+$', ''])
validate_re($keys_requestkey, ['^\d+$', ''])
Expand Down
1 change: 0 additions & 1 deletion spec/acceptance/restrict_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
2.times do
apply_manifest(pp, :catch_failures => true) do |r|
expect(r.stderr).not_to match(/error/i)
expect(r.exit_code).to be_zero
end
end
end
Expand Down
5 changes: 5 additions & 0 deletions templates/ntp.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ restrict 127.127.1.0
# Driftfile.
driftfile <%= @driftfile %>

<% unless @logfile.nil? %>
# Logfile
logfile = <%= @logfile %>
<% end %>

<% if @keys_enable -%>
keys <%= @keys_file %>
<% unless @keys_trusted.empty? -%>
Expand Down