aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-02-01 15:45:36 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-02-01 15:45:42 -0200
commit4f27fd7652d93182d9ad01138db35862dbaeca79 (patch)
tree81e929296c22f1d14796905bcc8f4189bc2deff8 /manifests
parent3601d987be24fb3e6692a27688e59ef675cbb088 (diff)
downloadpuppet-nodo-4f27fd7652d93182d9ad01138db35862dbaeca79.tar.gz
puppet-nodo-4f27fd7652d93182d9ad01138db35862dbaeca79.tar.bz2
Fixing puppet config
Diffstat (limited to 'manifests')
-rw-r--r--manifests/master.pp6
-rw-r--r--manifests/nodo.pp3
2 files changed, 5 insertions, 4 deletions
diff --git a/manifests/master.pp b/manifests/master.pp
index 1285f57..819ce43 100644
--- 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 32407d3..491d249 100644
--- 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': }
}
#