From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 20 Sep 2011 17:23:14 +0000 (-0300)
Subject: Introducing $puppetd_server
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=8645c26cba438b93737da57f9486a5ea50a46b7b;p=puppet-puppet.git

Introducing $puppetd_server
---

diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp
index 267f2dc..297bd89 100644
--- a/manifests/puppetd.pp
+++ b/manifests/puppetd.pp
@@ -13,6 +13,10 @@ class puppetd inherits puppet {
     '': { $puppetd_configtimeout = "120" }
   }
 
+  case $puppetd_server {
+    '': { $puppetd_server = "puppet.$domain" }
+  }
+
   package { "puppet":
    ensure  => installed,
    require => Package["cron"],
diff --git a/templates/puppet-node.conf.erb b/templates/puppet-node.conf.erb
index 87f61fb..ac113bc 100644
--- a/templates/puppet-node.conf.erb
+++ b/templates/puppet-node.conf.erb
@@ -9,7 +9,7 @@ pluginsync    = true
 [<%= puppet_agent_name %>]
 vardir        = /var/lib/puppet
 ssldir        = $vardir/ssl
-server        = puppet.<%= domain %>
+server        = <%= puppetd_server %>
 runinterval   = <%= puppetd_runinterval %>
 puppetport    = 8139
 masterport    = <%= puppetmaster_port %>