tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed puppetmaster bootstrap script for 2.6 series puppet.

Browse source
This commit is contained in:
Timo Mkinen 2011-04-19 15:43:33 +03:00
parent c91be3206f
commit 9c6b9e1a68
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
puppet/bootstrap-server.sh
View file

@ -19,8 +19,16 @@ fi
ssldir=`echo "require 'puppet'; Puppet.parse_config; print Puppet.settings.value('ssldir')" | ruby` ssldir=`echo "require 'puppet'; Puppet.parse_config; print Puppet.settings.value('ssldir')" | ruby`
( cat /dev/null > /etc/puppet/puppet.conf
echo "\$homename = '`hostname -f`'"
echo "\$puppet_ssldir = '${ssldir}'" puppet --version | egrep "^0\." > /dev/null 2>&1
echo "include puppet::server::apache" if [ $? -eq 0 ]; then
) | puppet --no-report (
echo "\$homename = '`hostname -f`'"
echo "\$puppet_ssldir = '${ssldir}'"
echo "include puppet::server::apache"
) | puppet --no-report
else
echo "include puppet::server::apache" | \
puppet apply --no-report --manifest /dev/stdin /dev/null
fi