Fixing puppet config

diff --git a/manifests/master.pp b/manifests/master.pp
index 1285f575ec6f8d936dea7103a1820d54a7113dec..819ce432effdb85ae4b9f29dd85c9fb96510bca8 100644 (file)
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -20,7 +20,7 @@ class nodo::master {
     host { "puppet":
       ensure => present,
       ip     => "127.0.0.1",
-      alias  => ["puppet.$domain"],
+      alias  => ["puppet.${::domain}"],
     }
   } else {
     class { 'puppet::master':
@@ -47,7 +47,7 @@ class nodo::master {
 
   # Update master's puppet.conf if you change here
   database::instance { "puppet":
-    password => "$db_password",
+    password => "${db_password}",
   }
 
   # Used for trac dependency graphs
@@ -56,5 +56,5 @@ class nodo::master {
   }
 
   # Check domain registration
-  domain::check { $domain: }
+  domain::check { $::domain: }
 }

diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index 32407d31d75982e1562130cbf007a9be1da49a1a..491d2490d9d35e63156edf463c49ab7136ddcc25 100644 (file)
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -13,8 +13,9 @@ class nodo {
 
   class { 'hosts': }
 
+  # then include puppet class
   if !defined('puppet::daemon') {
-    class { 'puppetd::daemon': }
+    class { 'puppet::daemon': }
   }
 
   #