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
/
client.pp
diff --git
a/modules/ntp/manifests/client.pp
b/modules/ntp/manifests/client.pp
index
d7eb618
..
d75702c
100644
(file)
--- a/
modules/ntp/manifests/client.pp
+++ b/
modules/ntp/manifests/client.pp
@@
-16,23
+16,23
@@
class ntp::client {
file { '/etc/ntp.keys.d/ntpkey_iff_bm-bl2':
source => 'puppet:///modules/ntp/ntpkey_iff_bm-bl2.pub',
}
file { '/etc/ntp.keys.d/ntpkey_iff_bm-bl2':
source => 'puppet:///modules/ntp/ntpkey_iff_bm-bl2.pub',
}
- file { '/etc/ntp.keys.d/ntpkey_iff_
dijkstra
':
-
source => 'puppet:///modules/ntp/ntpkey_iff_dijkstra.pub'
,
+ file { '/etc/ntp.keys.d/ntpkey_iff_
ubc-bl2
':
+
ensure => absent
,
}
}
- file { '/etc/ntp.keys.d/ntpkey_iff_
luchesi
':
-
source => 'puppet:///modules/ntp/ntpkey_iff_luchesi.pub'
,
+ file { '/etc/ntp.keys.d/ntpkey_iff_
ubc-bl6
':
+
ensure => absent
,
}
}
-
- file { '/etc/ntp.keys.d/ntpkey_iff_merikanto':
+ file { '/etc/ntp.keys.d/ntpkey_iff_dijkstra':
ensure => absent,
}
ensure => absent,
}
- file { '/etc/ntp.keys.d/ntpkey_iff_
orff
':
+ file { '/etc/ntp.keys.d/ntpkey_iff_
luchesi
':
ensure => absent,
}
file { '/etc/ntp.keys.d/ntpkey_iff_ravel':
ensure => absent,
}
ensure => absent,
}
file { '/etc/ntp.keys.d/ntpkey_iff_ravel':
ensure => absent,
}
- file { '/etc/ntp.keys.d/ntpkey_iff_busoni':
- ensure => absent,
+ file { '/usr/local/sbin/ntp-restart-if-required':
+ source => 'puppet:///modules/ntp/ntp-restart-if-required',
+ mode => '0555',
}
}
}
}