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 ded54e7291a78d30606604b9873b901c5288aa32..ab250f6d1b0e1c9481c0002386c9ca48aaf9d688 100644 (file)
--- a/modules/ntp/manifests/server.pp
+++ b/modules/ntp/manifests/server.pp
@@ -3,7 +3,8 @@ class ntp::server inherits ntp {
                owner   => root,
                group   => root,
                mode    => 444,
-               source  => [ "puppet:///ntp/server.conf" ],
+               source  => [ "puppet:///ntp/per-host/$fqdn/server.conf",
+                            "puppet:///ntp/common/server.conf" ],
                notify  => Exec["ntp restart"],
                require => Package["ntp"]
                ;