[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35
test branch
puppet-dev at googlegroups.com
Wed Jul 14 10:33:49 UTC 2010
The following commit has been merged in the upstream branch:
commit 5665e3984f73c70b90f65dd8bf4445b5adda5121
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Wed May 12 18:22:27 2010 -0700
Feature #2276 Single Executable: Update docstrings
Update documentation strings everywhere to use single-executable
notation rather than the old executable names.
Signed-off-by: Jesse Wolfe <jes5199 at gmail.com>
diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb
index b6ce5aa..39bcd26 100644
--- a/lib/puppet/application/apply.rb
+++ b/lib/puppet/application/apply.rb
@@ -96,7 +96,7 @@ class Puppet::Application::Apply < Puppet::Application
# Merge in the facts.
node.merge(facts.values)
- # Allow users to load the classes that puppetd creates.
+ # Allow users to load the classes that puppet agent creates.
if options[:loadclasses]
file = Puppet[:classfile]
if FileTest.exists?(file)
diff --git a/lib/puppet/configurer/fact_handler.rb b/lib/puppet/configurer/fact_handler.rb
index 72bd76e..5ff2020 100644
--- a/lib/puppet/configurer/fact_handler.rb
+++ b/lib/puppet/configurer/fact_handler.rb
@@ -11,7 +11,7 @@ module Puppet::Configurer::FactHandler
end
def find_facts
- # This works because puppetd configures Facts to use 'facter' for
+ # This works because puppet agent configures Facts to use 'facter' for
# finding facts and the 'rest' terminus for caching them. Thus, we'll
# compile them and then "cache" them on the server.
begin
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 9efa99c..da3aaa3 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -49,7 +49,7 @@ module Puppet
used during testing with TextMate), and ``false``, which produces
no color."],
:mkusers => [false,
- "Whether to create the necessary user and group that puppetd will
+ "Whether to create the necessary user and group that puppet agent will
run as."],
:manage_internal_file_permissions => [true,
"Whether Puppet should manage the owner, group, and mode of files
@@ -92,12 +92,12 @@ module Puppet
:authconfig => [ "$confdir/namespaceauth.conf",
"The configuration file that defines the rights to the different
namespaces and methods. This can be used as a coarse-grained
- authorization system for both ``puppetd`` and ``puppetmasterd``."
+ authorization system for both ``puppet agent`` and ``puppet master``."
],
:environment => {:default => "production", :desc => "The environment Puppet is running in. For clients
- (e.g., ``puppetd``) this determines the environment itself, which
+ (e.g., ``puppet agent``) this determines the environment itself, which
is used to find modules and much more. For servers (i.e.,
- ``puppetmasterd``) this provides the default environment for nodes
+ ``puppet master``) this provides the default environment for nodes
we know nothing about."
},
:diff_args => ["-u", "Which arguments to pass to the diff command when printing differences between files."],
@@ -119,7 +119,7 @@ module Puppet
:httplog => { :default => "$logdir/http.log",
:owner => "root",
:mode => 0640,
- :desc => "Where the puppetd web server logs."
+ :desc => "Where the puppet agent web server logs."
},
:http_proxy_host => ["none",
"The HTTP proxy host to use for outgoing connections. Note: You
@@ -223,7 +223,7 @@ module Puppet
:passfile => { :default => "$privatedir/password",
:mode => 0640,
:owner => "service",
- :desc => "Where puppetd stores the password for its private key.
+ :desc => "Where puppet agent stores the password for its private key.
Generally unused."
},
:hostcsr => { :default => "$ssldir/csr_$certname.pem",
@@ -369,12 +369,12 @@ module Puppet
)
self.setdefaults(:master,
- :user => ["puppet", "The user puppetmasterd should run as."],
- :group => ["puppet", "The group puppetmasterd should run as."],
+ :user => ["puppet", "The user puppet master should run as."],
+ :group => ["puppet", "The group puppet master should run as."],
:manifestdir => ["$confdir/manifests",
- "Where puppetmasterd looks for its manifests."],
+ "Where puppet master looks for its manifests."],
:manifest => ["$manifestdir/site.pp",
- "The entry-point manifest for puppetmasterd."],
+ "The entry-point manifest for puppet master."],
:code => ["", "Code to parse directly. This is essentially only used
by ``puppet``, and should only be set if you're writing your own Puppet
executable"],
@@ -382,7 +382,7 @@ module Puppet
:owner => "service",
:group => "service",
:mode => 0660,
- :desc => "Where puppetmasterd logs. This is generally not used,
+ :desc => "Where puppet master logs. This is generally not used,
since syslog is the default log destination."
},
:masterhttplog => { :default => "$logdir/masterhttp.log",
@@ -390,9 +390,9 @@ module Puppet
:group => "service",
:mode => 0660,
:create => true,
- :desc => "Where the puppetmasterd web server logs."
+ :desc => "Where the puppet master web server logs."
},
- :masterport => [8140, "Which port puppetmasterd listens on."],
+ :masterport => [8140, "Which port puppet master listens on."],
:parseonly => [false, "Just check the syntax of the manifests."],
:node_name => ["cert", "How the puppetmaster determines the client's identity
and sets the 'hostname', 'fqdn' and 'domain' facts for use in the manifest,
@@ -410,7 +410,7 @@ module Puppet
:rest_authconfig => [ "$confdir/auth.conf",
"The configuration file that defines the rights to the different
rest indirections. This can be used as a fine-grained
- authorization system for ``puppetmasterd``."
+ authorization system for ``puppet master``."
],
:ca => [true, "Wether the master should function as a certificate authority."],
:modulepath => {:default => "$confdir/modules:/usr/share/puppet/modules",
@@ -462,12 +462,12 @@ module Puppet
:localconfig => { :default => "$statedir/localconfig",
:owner => "root",
:mode => 0660,
- :desc => "Where puppetd caches the local configuration. An
+ :desc => "Where puppet agent caches the local configuration. An
extension indicating the cache format is added automatically."},
:statefile => { :default => "$statedir/state.yaml",
:mode => 0660,
- :desc => "Where puppetd and puppetmasterd store state associated
- with the running configuration. In the case of puppetmasterd,
+ :desc => "Where puppet agent and puppet master store state associated
+ with the running configuration. In the case of puppet master,
this file reflects the state discovered through interacting
with clients."
},
@@ -478,28 +478,28 @@ module Puppet
:classfile => { :default => "$statedir/classes.txt",
:owner => "root",
:mode => 0644,
- :desc => "The file in which puppetd stores a list of the classes
+ :desc => "The file in which puppet agent stores a list of the classes
associated with the retrieved configuration. Can be loaded in
the separate ``puppet`` executable using the ``--loadclasses``
option."},
:puppetdlog => { :default => "$logdir/puppetd.log",
:owner => "root",
:mode => 0640,
- :desc => "The log file for puppetd. This is generally not used."
+ :desc => "The log file for puppet agent. This is generally not used."
},
:server => ["puppet",
- "The server to which server puppetd should connect"],
+ "The server to which server puppet agent should connect"],
:ignoreschedules => [false,
- "Boolean; whether puppetd should ignore schedules. This is useful
- for initial puppetd runs."],
- :puppetport => [8139, "Which port puppetd listens on."],
- :noop => [false, "Whether puppetd should be run in noop mode."],
+ "Boolean; whether puppet agent should ignore schedules. This is useful
+ for initial puppet agent runs."],
+ :puppetport => [8139, "Which port puppet agent listens on."],
+ :noop => [false, "Whether puppet agent should be run in noop mode."],
:runinterval => [1800, # 30 minutes
- "How often puppetd applies the client configuration; in seconds."],
- :listen => [false, "Whether puppetd should listen for
+ "How often puppet agent applies the client configuration; in seconds."],
+ :listen => [false, "Whether puppet agent should listen for
connections. If this is true, then by default only the
``runner`` server is started, which allows remote authorized
- and authenticated nodes to connect and trigger ``puppetd``
+ and authenticated nodes to connect and trigger ``puppet agent``
runs."],
:ca_server => ["$server", "The server to use for certificate
authority requests. It's a separate server because it cannot
@@ -523,7 +523,7 @@ module Puppet
can be guaranteed to support this format, but it will be used for all
classes that support it."],
:puppetdlockfile => [ "$statedir/puppetdlock",
- "A lock file to temporarily stop puppetd from doing anything."],
+ "A lock file to temporarily stop puppet agent from doing anything."],
:usecacheonfailure => [true,
"Whether to use the cached configuration when the remote
configuration will not compile. This option is useful for testing
@@ -586,7 +586,7 @@ module Puppet
like OmniGraffle or dot (which is part of ImageMagick)."],
:graphdir => ["$statedir/graphs", "Where to store dot-outputted graphs."],
:http_compression => [false, "Allow http compression in REST communication with the master.
- This setting might improve performance for puppetd -> puppetmasterd communications over slow WANs.
+ This setting might improve performance for agent -> master communications over slow WANs.
Your puppetmaster needs to support compression (usually by activating some settings in a reverse-proxy
in front of the puppetmaster, which rules out webrick).
It is harmless to activate this settings if your master doesn't support
diff --git a/lib/puppet/network/authconfig.rb b/lib/puppet/network/authconfig.rb
index 0922393..bf037fb 100644
--- a/lib/puppet/network/authconfig.rb
+++ b/lib/puppet/network/authconfig.rb
@@ -37,7 +37,7 @@ module Puppet
end
# Does the file exist? Puppetmasterd does not require it, but
- # puppetd does.
+ # puppet agent does.
def exists?
FileTest.exists?(@file)
end
diff --git a/lib/puppet/reference/configuration.rb b/lib/puppet/reference/configuration.rb
index 477b9a7..352116c 100644
--- a/lib/puppet/reference/configuration.rb
+++ b/lib/puppet/reference/configuration.rb
@@ -57,14 +57,14 @@ These parameters can be supplied to the executables either as command-line
options or in the configuration file. For instance, the command-line
invocation below would set the configuration directory to ``/private/puppet``::
- $ puppetd --confdir=/private/puppet
+ $ puppet agent --confdir=/private/puppet
Note that boolean options are turned on and off with a slightly different
syntax on the command line::
- $ puppetd --storeconfigs
+ $ puppet agent --storeconfigs
- $ puppetd --no-storeconfigs
+ $ puppet agent --no-storeconfigs
The invocations above will enable and disable, respectively, the storage of
the client configuration.
@@ -81,11 +81,8 @@ executables look for ``puppet.conf`` in their configuration directory
``~user/.puppet/puppet.conf`` as a regular user by default.
All executables will set any parameters set within the ``main`` section,
-while each executable will also look for a section named for the executable
-and load those parameters. For example, ``puppetd`` will look for a
-section named ``puppetd``, and ``puppetmasterd`` looks for a section
-named ``puppetmasterd``. This allows you to use a single configuration file
-to customize the settings for all of your executables.
+and each executable will also use one of the ``master``, ``agent``, or
+``user`` sections.
File Format
'''''''''''
@@ -111,7 +108,7 @@ the executable in question with the `--genconfig` command. The executable
will print a template configuration to standard output, which can be
redirected to a file like so::
- $ puppetd --genconfig > /etc/puppet/puppet.conf
+ $ puppet agent --genconfig > /etc/puppet/puppet.conf
Note that this invocation will replace the contents of any pre-existing
`puppet.conf` file, so make a backup of your present config if it contains
@@ -122,23 +119,23 @@ argument, which will generate a manifest that can be used to manage all of
Puppet's directories and files and prints it to standard output. This can
likewise be redirected to a file::
- $ puppetd --genmanifest > /etc/puppet/manifests/site.pp
+ $ puppet agent --genmanifest > /etc/puppet/manifests/site.pp
Puppet can also create user and group accounts for itself (one `puppet` group
and one `puppet` user) if it is invoked as `root` with the `--mkusers` argument::
- $ puppetd --mkusers
+ $ puppet agent --mkusers
Signals
-------
-The ``puppetd`` and ``puppetmasterd`` executables catch some signals for special
+The ``puppet agent`` and ``puppet master`` executables catch some signals for special
handling. Both daemons catch (``SIGHUP``), which forces the server to restart
tself. Predictably, interrupt and terminate (``SIGINT`` and ``SIGTERM``) will shut
-down the server, whether it be an instance of ``puppetd`` or ``puppetmasterd``.
+down the server, whether it be an instance of ``puppet agent`` or ``puppet master``.
-Sending the ``SIGUSR1`` signal to an instance of ``puppetd`` will cause it to
+Sending the ``SIGUSR1`` signal to an instance of ``puppet agent`` will cause it to
immediately begin a new configuration transaction with the server. This
-signal has no effect on ``puppetmasterd``.
+signal has no effect on ``puppet master``.
Configuration Parameter Reference
---------------------------------
diff --git a/lib/puppet/reference/indirection.rb b/lib/puppet/reference/indirection.rb
index 0743981..13c014e 100644
--- a/lib/puppet/reference/indirection.rb
+++ b/lib/puppet/reference/indirection.rb
@@ -26,7 +26,7 @@ end
reference.header = "This is the list of all indirections, their associated terminus classes, and how you select between them.
-In general, the appropriate terminus class is selected by the application for you (e.g., ``puppetd`` would always use the ``rest``
+In general, the appropriate terminus class is selected by the application for you (e.g., ``puppet agent`` would always use the ``rest``
terminus for most of its indirected classes), but some classes are tunable via normal settings. These will have ``terminus setting``
documentation listed with them.
diff --git a/lib/puppet/reference/network.rb b/lib/puppet/reference/network.rb
index 1b635fd..14b26dd 100644
--- a/lib/puppet/reference/network.rb
+++ b/lib/puppet/reference/network.rb
@@ -27,8 +27,8 @@ on the server, and the client knows how to call the handler's methods
appropriately.
Most handlers are meant to be started on the server, usually within
-``puppetmasterd``, and the clients are mostly started on the client,
-usually within ``puppetd``.
+``puppet master``, and the clients are mostly started on the client,
+usually within ``puppet agent``.
You can find the server-side handler for each interface at
``puppet/network/handler/<name>.rb`` and the client class at
diff --git a/lib/puppet/ssl/host.rb b/lib/puppet/ssl/host.rb
index 0a3c029..8b45567 100644
--- a/lib/puppet/ssl/host.rb
+++ b/lib/puppet/ssl/host.rb
@@ -61,7 +61,7 @@ class Puppet::SSL::Host
CertificateRequest.cache_class = cache
CertificateRevocationList.cache_class = cache
else
- # Make sure we have no cache configured. puppetmasterd
+ # Make sure we have no cache configured. puppet master
# switches the configurations around a bit, so it's important
# that we specify the configs for absolutely everything, every
# time.
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index e854541..ce79683 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -1203,7 +1203,7 @@ class Type
Tags are currently useful for things like applying a subset of a
host's configuration::
- puppetd --test --tags mytag
+ puppet agent --test --tags mytag
This way, when you're testing a configuration you can run just the
portion you're testing."
diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb
index e947615..2e249ad 100644
--- a/lib/puppet/type/file.rb
+++ b/lib/puppet/type/file.rb
@@ -74,7 +74,7 @@ Puppet::Type.newtype(:file) do
server => puppet
}
- The ``puppetmasterd`` daemon creates a filebucket by default,
+ The ``puppet master`` daemon creates a filebucket by default,
so you can usually back up to your main server with this
configuration. Once you've described the bucket in your
configuration, you can use it in any file::
diff --git a/lib/puppet/type/file/source.rb b/lib/puppet/type/file/source.rb
index 1eb418e..cf861a0 100755
--- a/lib/puppet/type/file/source.rb
+++ b/lib/puppet/type/file/source.rb
@@ -28,8 +28,8 @@ module Puppet
}
}
- You can also leave out the server name, in which case ``puppetd``
- will fill in the name of its configuration server and ``puppet``
+ You can also leave out the server name, in which case ``puppet agent``
+ will fill in the name of its configuration server and ``puppet apply``
will use the local filesystem. This makes it easy to use the same
configuration in both local and centralized forms.
@@ -37,9 +37,9 @@ module Puppet
URL's. Puppet will connect to the file server running on
``server`` to retrieve the contents of the file. If the
``server`` part is empty, the behavior of the command-line
- interpreter (``puppet``) and the client demon (``puppetd``) differs
- slightly: ``puppet`` will look such a file up on the module path
- on the local host, whereas ``puppetd`` will connect to the
+ interpreter (``puppet apply``) and the client demon (``puppet agent``) differs
+ slightly: ``apply`` will look such a file up on the module path
+ on the local host, whereas ``agent`` will connect to the
puppet server that it received the manifest from.
See the `FileServingConfiguration fileserver configuration documentation`:trac: for information on how to configure
diff --git a/lib/puppet/type/notify.rb b/lib/puppet/type/notify.rb
index cfaa240..a8ac49b 100644
--- a/lib/puppet/type/notify.rb
+++ b/lib/puppet/type/notify.rb
@@ -4,7 +4,7 @@
module Puppet
newtype(:notify) do
- @doc = "Sends an arbitrary message to the puppetd run-time log."
+ @doc = "Sends an arbitrary message to the agent run-time log."
newproperty(:message) do
desc "The message to be sent to the log."
--
Puppet packaging for Debian
More information about the Pkg-puppet-devel
mailing list