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

puppet/bootstrap-server.sh

@@ -23,10 +23,10 @@ if [ ! -s /etc/puppet/manifests/site.pp ]; then
     echo "" > /etc/puppet/manifests/site.pp
 fi
 
-ssldir=`echo "require 'puppet'; Puppet.parse_config; print Puppet.settings.value('ssldir')" | ruby`
-
 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
 if [ $? -eq 0 ]; then
     (

puppet/templates/puppet.conf.erb

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