]> gitweb.fluxo.info Git - puppet-puppet.git/commitdiff
Introducing $puppetd_server
authorSilvio Rhatto <rhatto@riseup.net>
Tue, 20 Sep 2011 17:23:14 +0000 (14:23 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Tue, 20 Sep 2011 17:23:14 +0000 (14:23 -0300)
manifests/puppetd.pp
templates/puppet-node.conf.erb

index 267f2dce8624f61d8c866b96520776bb3a6199ef..297bd89d4215be047253860f3ad06bf4a72aa0bb 100644 (file)
@@ -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"],
index 87f61fbbe9ad2a3838cddb2ea3b841a7d19f5b0e..ac113bcb799dc6fd9286a3c95e32e67c2d59534f 100644 (file)
@@ -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 %>