environment fix

2014-12-10 09:48:33 +01:00
parent 395bcc65c5
commit 340bdf611c
2 changed files with 2 additions and 2 deletions
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -9,7 +9,7 @@ class puppet::agent (
  $maxsleep        = '3200',
  $puppet_master   = undef,
  $cron            = true,
-  $environment     = gsub($::domain, '.lan', '')) {
+  $environment     = gsub($::domain, '.(lan|mysportgroup\.de)', '')) {
  case $::kernel {
    'Linux' : {
      $puppetpkgs = ['puppet', 'puppet-common']
--- a/templates/puppet.conf.erb
+++ b/templates/puppet.conf.erb
@@ -38,4 +38,4 @@ splay=true
 report=true
 server=<%= scope.lookupvar("puppetmaster_server") %>
 configtimeout=720
-environment=<% @domain.gsub('.(lan|mysportgroup.de)','')
+environment=<%= @environment %>