diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-10-21 06:16:43 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-10-21 06:16:43 +0000 |
| commit | a232e5c6ef359b600cdbc618a9791f8eda8eb081 (patch) | |
| tree | 7ec9cc3700f0daae1b5216a9afd0f220a553f9b6 /bin | |
| parent | a6d02920d360ac06815dcf08f3350ba92088301d (diff) | |
| download | puppet-a232e5c6ef359b600cdbc618a9791f8eda8eb081.tar.gz | |
Made tweaks here and there to get it running better on my local network. I am inches away from that happening. All tests pass.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@720 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/puppetca | 8 | ||||
| -rwxr-xr-x | bin/puppetd | 2 | ||||
| -rwxr-xr-x | bin/puppetmasterd | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/bin/puppetca b/bin/puppetca index af04f12a2..af1c94576 100755 --- a/bin/puppetca +++ b/bin/puppetca @@ -11,6 +11,7 @@ # puppetca [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose] # [--cadir <ca directory>] [-g|--generate] [-l|--list] # [-s|--sign] [--ssldir <cert directory>] +# [-c|--confdir <configuration directory>] # # = Description # @@ -27,6 +28,10 @@ # cadir:: # Where to look for the ca directory. Defaults to /etc/puppet/ssl/ca. # +# confdir:: +# The configuration root directory, where +puppetmasterd+ defaults to looking +# for all of its configuration files. Defaults to +/etc/puppet+. +# # debug:: # Enable full debugging. # @@ -80,6 +85,7 @@ end result = GetoptLong.new( [ "--all", "-a", GetoptLong::NO_ARGUMENT ], [ "--cadir", GetoptLong::REQUIRED_ARGUMENT ], + [ "--confdir", "-c", GetoptLong::REQUIRED_ARGUMENT ], [ "--debug", "-d", GetoptLong::NO_ARGUMENT ], [ "--generate", "-g", GetoptLong::NO_ARGUMENT ], [ "--help", "-h", GetoptLong::NO_ARGUMENT ], @@ -100,6 +106,8 @@ begin all = true when "--cadir" Puppet[:cadir] = arg + when "--confdir" + Puppet[:puppetconf] = arg when "--debug" Puppet[:loglevel] = :debug when "--generate" diff --git a/bin/puppetd b/bin/puppetd index aba1ebe79..2d11f4d7e 100755 --- a/bin/puppetd +++ b/bin/puppetd @@ -11,7 +11,7 @@ # puppetd [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose] # [--ssldir <cert directory>] [-l|--logdest <syslog|<file>|console>] # [--fqdn <host name>] [-p|--port <port>] [-s|--server <server>] -# [-w|--waitforcert <seconds>] +# [-w|--waitforcert <seconds>] [-c|--confdir <configuration directory>] # # = Description # diff --git a/bin/puppetmasterd b/bin/puppetmasterd index 33b3d1c8f..cd1800927 100755 --- a/bin/puppetmasterd +++ b/bin/puppetmasterd @@ -193,8 +193,6 @@ end bg = false -Puppet[:autosign] = true - unless Puppet[:loglevel] == :debug or Puppet[:loglevel] == :info bg = true end |