Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

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

diff --git a/modules/ntp/manifests/server.pp b/modules/ntp/manifests/server.pp
index cc5b3dcba7880e5e78b2fc9adfe62a8007543c3e..ab250f6d1b0e1c9481c0002386c9ca48aaf9d688 100644 (file)
--- a/modules/ntp/manifests/server.pp
+++ b/modules/ntp/manifests/server.pp
@@ -2,8 +2,9 @@ class ntp::server inherits ntp {
        file { "/etc/ntp.conf":
                owner   => root,
                group   => root,
-               mode    => 440,
-               source  => [ "puppet:///ntp/server.conf" ],
+               mode    => 444,
+               source  => [ "puppet:///ntp/per-host/$fqdn/server.conf",
+                            "puppet:///ntp/common/server.conf" ],
                notify  => Exec["ntp restart"],
                require => Package["ntp"]
                ;