puppet_modules/puppet
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

environment fix

Browse Source
This commit is contained in:
Udo Waechter
2014-12-10 09:48:33 +01:00
parent 395bcc65c5
commit 340bdf611c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/agent.pp
View File

@@ -9,7 +9,7 @@ class puppet::agent (
$maxsleep = '3200', $maxsleep = '3200',
$puppet_master = undef, $puppet_master = undef,
$cron = true, $cron = true,
$environment = gsub($::domain, '.lan', '')) { $environment = gsub($::domain, '.(lan|mysportgroup\.de)', '')) {
case $::kernel { case $::kernel {
'Linux' : { 'Linux' : {
$puppetpkgs = ['puppet', 'puppet-common'] $puppetpkgs = ['puppet', 'puppet-common']

2
templates/puppet.conf.erb
View File

@@ -38,4 +38,4 @@ splay=true
report=true report=true
server=<%= scope.lookupvar("puppetmaster_server") %> server=<%= scope.lookupvar("puppetmaster_server") %>
configtimeout=720 configtimeout=720
environment=<% @domain.gsub('.(lan|mysportgroup.de)','') environment=<%= @environment %>