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

Changed puppet ssl directory to default location (/etc/puppet/ssl).

Browse source
This commit is contained in:
Timo Mkinen 2011-07-28 14:59:22 +03:00
parent 10fa19d80e
commit bda06f269d
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
puppet/bootstrap-server.sh
View file

@ -23,10 +23,10 @@ if [ ! -s /etc/puppet/manifests/site.pp ]; then
echo "" > /etc/puppet/manifests/site.pp echo "" > /etc/puppet/manifests/site.pp
fi fi
ssldir=`echo "require 'puppet'; Puppet.parse_config; print Puppet.settings.value('ssldir')" | ruby`
cat /dev/null > /etc/puppet/puppet.conf cat /dev/null > /etc/puppet/puppet.conf
ssldir=`echo "require 'puppet'; Puppet.parse_config; print Puppet.settings.value('ssldir')" | ruby`
puppet --version | egrep "^0\." > /dev/null 2>&1 puppet --version | egrep "^0\." > /dev/null 2>&1
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
( (

4
puppet/templates/puppet.conf.erb
View file

@ -12,10 +12,6 @@
# The default value is '$vardir/run'. # The default value is '$vardir/run'.
rundir = /var/run/puppet rundir = /var/run/puppet
# Where SSL certificates are kept.
# The default value is '$confdir/ssl'.
ssldir = $vardir/ssl
<% end -%> <% end -%>
<% if kernel == 'OpenBSD' -%> <% if kernel == 'OpenBSD' -%>
# The shell search path. Defaults to whatever is inherited # The shell search path. Defaults to whatever is inherited