massive style guide fixups

[dsa-puppet.git] / modules / ntp / manifests / init.pp

diff --git a/modules/ntp/manifests/init.pp b/modules/ntp/manifests/init.pp
index a499bb638a23f56e8b60a20c27f627aced151324..26aa2d4f8fcb5ccd7168f5a9b0e3ee248f7621fa 100644 (file)
--- a/modules/ntp/manifests/init.pp
+++ b/modules/ntp/manifests/init.pp
@@ -1,33 +1,43 @@
 class ntp {
-       package { ntp: ensure => installed }
-       file {  "/var/lib/ntp/":
-                       ensure  => directory,
-                       owner   => ntp,
-                       group   => ntp,
-                       mode    => 755
-                       ;
-               "/var/lib/ntpstats":
-                       ensure  => directory,
-                       owner   => ntp,
-                       group   => ntp,
-                       mode    => 755
-                       ;
-               "/etc/ntp.conf":
-                       owner   => root,
-                       group   => root,
-                       mode    => 444,
-                       content => template("ntp/ntp.conf"),
-                       notify  => Exec["ntp restart"],
-                       require => Package["ntp"]
-                       ;
+
+       package { 'ntp':
+               ensure => installed
        }
-       exec { "ntp restart":
-               path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-               refreshonly => true,
+
+       service { 'ntp':
+               ensure  => running,
+               require => Package['ntp']
+       }
+
+       @ferm::rule { 'dsa-ntp':
+               domain      => '(ip ip6)',
+               description => 'Allow ntp access',
+               rule        => '&SERVICE(udp, 123)'
+       }
+
+       file { '/var/lib/ntp':
+               ensure  => directory,
+               owner   => ntp,
+               group   => ntp,
+               mode    => '0755',
+               require => Package['ntp']
+       }
+       file { '/etc/ntp.conf':
+               content => template('ntp/ntp.conf'),
+               notify  => Service['ntp'],
+               require => Package['ntp']
+       }
+       file { '/etc/ntp.keys.d':
+               ensure  => directory,
+               group   => ntp,
+               mode    => '0750',
+               notify  => Service['ntp'],
+               require => Package['ntp']
+       }
+
+       if getfromhash($site::nodeinfo, 'timeserver') {
+               include ntp::timeserver
+       } else {
+               include ntp::client
        }
-        ferm::rule { "dsa-ntp":
-                domain          => (ip ip6),
-                description     => "Allow ntp access",
-                rule            => "proto udp mod state state (NEW) dport (123) ACCEPT"
-        }
 }