Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Lonlone Lee
base
Commits
f54d9aff
Commit
f54d9aff
authored
Jan 11, 2016
by
Jonathan Lent
Browse files
[puppetclient] fixing template related to Puppet 2.X hosts
parent
8d14785b
Changes
1
Hide whitespace changes
Inline
Side-by-side
templates/puppetclient/puppet.conf.template.erb
View file @
f54d9aff
...
...
@@ -26,27 +26,21 @@
pserver
=
server
elsif
(
is_master
)
then
pserver
=
fqdn
elsif
(
hostname
=~
/^frankoz\d(-(test|new|build|old))?$/
)
then
pserver
=
'jimhenson1.stanford.edu'
elsif
(
puppet3
)
then
else
if
(
hostname
=~
/^(puppetrepo-dev|puppetdb-dev).*$/
)
then
pserver
=
'puppetservice1-dev.stanford.edu'
else
pserver
=
'puppetservice.stanford.edu'
end
else
pserver
=
'jimhenson.stanford.edu'
end
end
# Figure out what Puppet CA service to use.
if
(
ca_server
!=
''
)
then
pca_server
=
ca_server
elsif
(
hostname
=~
/^(puppetservice.*dev|puppetrepo-dev|puppetdb-dev).*$/
)
then
pca_server
=
'puppetca-dev.stanford.edu'
elsif
(
puppet3
)
then
pca_server
=
'puppetrepo.stanford.edu'
else
pca_server
=
'puppet
ca
.stanford.edu'
pca_server
=
'puppet
repo
.stanford.edu'
end
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment