summaryrefslogtreecommitdiffstats
path: root/bin/puppetmasterd
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-06-20 18:10:06 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-06-20 18:10:06 +0000
commit46824cd8167e2d07ba1f1bdb0cc24789b3a565b1 (patch)
tree17c71d0bcf72eed63652ffa2493a40f4302301b1 /bin/puppetmasterd
parent15905bd5ee0d692e44bed516fe720c278ce67835 (diff)
downloadpuppet-46824cd8167e2d07ba1f1bdb0cc24789b3a565b1.tar.gz
puppet-46824cd8167e2d07ba1f1bdb0cc24789b3a565b1.tar.xz
puppet-46824cd8167e2d07ba1f1bdb0cc24789b3a565b1.zip
Setting pluginsync default to false, and (hopefully) fixing autosign problem when the file exists and autosign is set to true (#180). The problem was that the puppetmasterd script was redundantly setting autosign in the CA, when the CA already knows how to deal with autosigning, which meant that autosign was being set before the config was parsed. Thus, there was no bug when autosign was set on the command line but there was when it was set in the config.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1304 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'bin/puppetmasterd')
-rwxr-xr-xbin/puppetmasterd2
1 files changed, 0 insertions, 2 deletions
diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index feaec5dbc..ff00d0c8f 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -164,8 +164,6 @@ rescue GetoptLong::InvalidOption => detail
#end
exit(1)
end
-ca[:autosign] = Puppet[:autosign]
-
# Handle the logging settings.
if options[:debug] or options[:verbose]