projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not ship sbin/mirror-health from the roles version while we migrate
[mirror/dsa-puppet.git]
/
modules
/
ntp
/
manifests
/
init.pp
diff --git
a/modules/ntp/manifests/init.pp
b/modules/ntp/manifests/init.pp
index
4f6ff68
..
018e5fc
100644
(file)
--- a/
modules/ntp/manifests/init.pp
+++ b/
modules/ntp/manifests/init.pp
@@
-1,20
+1,24
@@
class ntp {
class ntp {
-
package { 'ntp':
ensure => installed
}
service { 'ntp':
package { 'ntp':
ensure => installed
}
service { 'ntp':
- ensure =>
stopped
,
+ ensure =>
running
,
require => Package['ntp']
}
require => Package['ntp']
}
-
@
ferm::rule { 'dsa-ntp':
+ ferm::rule { 'dsa-ntp':
domain => '(ip ip6)',
description => 'Allow ntp access',
rule => '&SERVICE(udp, 123)'
}
domain => '(ip ip6)',
description => 'Allow ntp access',
rule => '&SERVICE(udp, 123)'
}
+ file { '/etc/init.d/ntp':
+ source => 'puppet:///modules/ntp/ntp.init',
+ mode => '0555',
+ notify => Exec['systemctl daemon-reload'],
+ }
file { '/var/lib/ntp':
ensure => directory,
owner => ntp,
file { '/var/lib/ntp':
ensure => directory,
owner => ntp,
@@
-35,7
+39,13
@@
class ntp {
require => Package['ntp'],
}
require => Package['ntp'],
}
- if getfromhash($site::nodeinfo, 'timeserver') {
+ munin::check { [
+ 'ntp_offset',
+ 'ntp_states',
+ ]:
+ }
+
+ if getfromhash($deprecated::nodeinfo, 'timeserver') {
include ntp::timeserver
} else {
include ntp::client
include ntp::timeserver
} else {
include ntp::client