projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move logging and related/established out of ferm.conf into a dsa.d rule
[mirror/dsa-puppet.git]
/
modules
/
ntp
/
manifests
/
init.pp
diff --git
a/modules/ntp/manifests/init.pp
b/modules/ntp/manifests/init.pp
index
0cfb625
..
6efd469
100644
(file)
--- a/
modules/ntp/manifests/init.pp
+++ b/
modules/ntp/manifests/init.pp
@@
-1,19
+1,11
@@
class ntp {
class ntp {
-
package { 'ntp':
ensure => installed
}
package { 'ntp':
ensure => installed
}
- if ($::lsbmajdistrelease >= 8) {
- service { 'ntp':
- ensure => stopped,
- require => Package['ntp']
- }
- } else {
- service { 'ntp':
- ensure => running,
- require => Package['ntp']
- }
+ service { 'ntp':
+ ensure => running,
+ require => Package['ntp']
}
@ferm::rule { 'dsa-ntp':
}
@ferm::rule { 'dsa-ntp':
@@
-22,6
+14,11
@@
class ntp {
rule => '&SERVICE(udp, 123)'
}
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,
@@
-42,6
+39,12
@@
class ntp {
require => Package['ntp'],
}
require => Package['ntp'],
}
+ munin::check { [
+ 'ntp_offset',
+ 'ntp_states',
+ ]:
+ }
+
if getfromhash($site::nodeinfo, 'timeserver') {
include ntp::timeserver
} else {
if getfromhash($site::nodeinfo, 'timeserver') {
include ntp::timeserver
} else {