make nagios happy

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

diff --git a/modules/dacs/manifests/init.pp b/modules/dacs/manifests/init.pp
index 377dfa9dadf460cb35cc877f4fc9cc48bfece5f8..bd5bd82772a0b48140aa3e0bf58f21b0248c78c0 100644 (file)
--- a/modules/dacs/manifests/init.pp
+++ b/modules/dacs/manifests/init.pp
@@ -1,3 +1,11 @@
+# = Class: dacs
+#
+# This class installs and configures dacs for web auth
+#
+# == Sample Usage:
+#
+#   include dacs
+#
 class dacs {
        package { 'dacs':
                ensure => installed,
@@ -35,7 +43,8 @@ class dacs {
                group   => www-data
        }
        file { '/etc/dacs/federations/debian.org/DEBIAN/dacs.conf':
-               source => 'puppet:///modules/dacs/common/dacs.conf',
+               source  => ['puppet:///modules/dacs/per-host/${::fqdn}/dacs.conf',
+                       'puppet:///modules/dacs/common/dacs.conf', ],
                mode    => '0640',
                owner   => root,
                group   => www-data
@@ -53,7 +62,7 @@ class dacs {
                group   => www-data
        }
        file { '/etc/dacs/federations/debian.org/DEBIAN/acls/acl-noauth.0':
-               source  => [ 'puppet:///modules/dacs/per-host/$fqdn/acl-noauth.0',
+               source  => [ "puppet:///modules/dacs/per-host/${::fqdn}/acl-noauth.0",
                        'puppet:///modules/dacs/common/acl-noauth.0' ],
                mode    => '0640',
                owner   => root,
@@ -61,7 +70,7 @@ class dacs {
                notify  => Exec['dacsacl']
        }
        file { '/etc/dacs/federations/debian.org/DEBIAN/acls/acl-private.0':
-               source  => [ 'puppet:///modules/dacs/per-host/$fqdn/acl-private.0',
+               source  => [ "puppet:///modules/dacs/per-host/${::fqdn}/acl-private.0",
                        'puppet:///modules/dacs/common/acl-private.0' ],
                mode    => '0640',
                owner   => root,