Please review pull request #760: remove deprecated standalone commands opened by (pcarlisle)
Description:
Remove deprecated standalone commands:
filebucket
pi
puppetdoc
ralsh
puppetca
puppetd
puppetmasterd
puppetqd
puppetrun
- Opened: Fri May 11 19:14:07 UTC 2012
- Based on: puppetlabs:master (80c8f0a7b3a8b944388f506861c06efe6656020a)
- Requested merge: pcarlisle:maint/master/remove-deprecated-standalone-commands (86b15fca04e76b3e8dbe179021f45f34627b1da6)
Diff follows:
diff --git a/bin/filebucket b/bin/filebucket
deleted file mode 100755
index 95ef7c6..0000000
--- a/bin/filebucket
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'puppet/application'
-require 'puppet/application/filebucket'
-
-# launch the filebucket
-Puppet::Application[:filebucket].run
diff --git a/bin/pi b/bin/pi
deleted file mode 100755
index f2e7312..0000000
--- a/bin/pi
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'puppet/application/describe'
-
-Puppet::Application[:describe].run
diff --git a/bin/puppetdoc b/bin/puppetdoc
deleted file mode 100755
index ea08aa2..0000000
--- a/bin/puppetdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'puppet/application/doc'
-Puppet::Application[:doc].run
diff --git a/bin/ralsh b/bin/ralsh
deleted file mode 100755
index a788e35..0000000
--- a/bin/ralsh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'puppet/application/resource'
-Puppet::Application[:resource].run
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index b806e33..857a554 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -450,7 +450,7 @@ def setup
# we want the last report to be persisted locally
Puppet::Transaction::Report.indirection.cache_class = :yaml
- # Override the default; puppetd needs this, usually.
+ # Override the default; puppet agent needs this, usually.
# You can still override this on the command-line with, e.g., :compiler.
Puppet[:catalog_terminus] = :rest
Puppet[:node_terminus] = :rest
diff --git a/lib/puppet/application/device.rb b/lib/puppet/application/device.rb
index f49f532..1361b36 100644
--- a/lib/puppet/application/device.rb
+++ b/lib/puppet/application/device.rb
@@ -228,7 +228,7 @@ def setup
Puppet::Transaction::Report.indirection.terminus_class = :rest
- # Override the default; puppetd needs this, usually.
+ # Override the default; the agent needs this, usually.
# You can still override this on the command-line with, e.g., :compiler.
Puppet[:catalog_terminus] = :rest
diff --git a/lib/puppet/application/queue.rb b/lib/puppet/application/queue.rb
index e0304de..1363651 100644
--- a/lib/puppet/application/queue.rb
+++ b/lib/puppet/application/queue.rb
@@ -122,7 +122,7 @@ def help
def main
require 'puppet/indirector/catalog/queue' # provides Puppet::Indirector::Queue.subscribe
- Puppet.notice "Starting puppetqd #{Puppet.version}"
+ Puppet.notice "Starting puppet queue #{Puppet.version}"
Puppet::Resource::Catalog::Queue.subscribe do |catalog|
# Once you have a Puppet::Resource::Catalog instance, passing it to save should suffice
# to put it through to the database via its active_record indirector (which is determined
diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb
index e3fbcaf..75b373d 100644
--- a/lib/puppet/configurer.rb
+++ b/lib/puppet/configurer.rb
@@ -24,8 +24,8 @@ def self.to_s
end
class << self
- # Puppetd should only have one instance running, and we need a way
- # to retrieve it.
+ # Puppet agent should only have one instance running, and we need a
+ # way to retrieve it.
attr_accessor :instance
include Puppet::Util
end
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index fae41d9..996edc2 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -303,7 +303,7 @@ module Puppet
:default => false,
:type => :boolean,
:desc => "Whether to use a queueing system to provide asynchronous database integration.
- Requires that `puppetqd` be running and that 'PSON' support for ruby be installed.",
+ Requires that `puppet queue` be running and that 'PSON' support for ruby be installed.",
:hook => proc do |value|
if value
# This reconfigures the terminii for Node, Facts, and Catalog
diff --git a/lib/puppet/face/resource.rb b/lib/puppet/face/resource.rb
index 95a2ffc..99e9bec 100644
--- a/lib/puppet/face/resource.rb
+++ b/lib/puppet/face/resource.rb
@@ -7,7 +7,7 @@
summary "API only: interact directly with resources via the RAL."
description <<-'EOT'
API only: this face provides a Ruby API with functionality similar to the
- puppet resource (or ralsh) subcommand.
+ puppet resource subcommand.
EOT
get_action(:destroy).summary "Invalid for this subcommand."
diff --git a/lib/puppet/network/authconfig.rb b/lib/puppet/network/authconfig.rb
index 02fb2f1..f014727 100644
--- a/lib/puppet/network/authconfig.rb
+++ b/lib/puppet/network/authconfig.rb
@@ -33,7 +33,7 @@ def allowed?(request)
false
end
- # Does the file exist? Puppetmasterd does not require it, but
+ # Does the file exist? Puppet master does not require it, but
# puppet agent does.
def exists?
FileTest.exists?(@file)
diff --git a/lib/puppet/network/authorization.rb b/lib/puppet/network/authorization.rb
index b9cab21..4f09d56 100644
--- a/lib/puppet/network/authorization.rb
+++ b/lib/puppet/network/authorization.rb
@@ -15,36 +15,32 @@ def authconfig
@authconfig
end
+ # This is just the logic of authorized? extracted so it's separate from
+ # the logging
+ def check_auth(request)
+ if request.authenticated?
+ if authconfig.exists?
+ authconfig.allowed?(request)
+ else
+ Puppet.run_mode.master?
+ end
+ else
+ false
+ end
+ end
+ private :check_auth
+
# Verify that our client has access. We allow untrusted access to
# puppetca methods but no others.
def authorized?(request)
msg = "#{request.authenticated? ? "authenticated" : "unauthenticated"} client #{request} access to #{request.call}"
- if request.authenticated?
- if authconfig.exists?
- if authconfig.allowed?(request)
- Puppet.debug "Allowing #{msg}"
- return true
- else
- Puppet.notice "Denying #{msg}"
- return false
- end
- else
- if Puppet.run_mode.master?
- Puppet.debug "Allowing #{msg}"
- return true
- else
- Puppet.notice "Denying #{msg}"
- return false
- end
- end
+ if check_auth(request)
+ Puppet.notice "Allowing #{msg}"
+ true
else
- if request.handler == "puppetca"
- Puppet.notice "Allowing #{msg}"
- else
- Puppet.notice "Denying #{msg}"
- return false
- end
+ Puppet.notice "Denying #{msg}"
+ false
end
end
diff --git a/lib/puppet/run.rb b/lib/puppet/run.rb
index 150e644..8d57788 100644
--- a/lib/puppet/run.rb
+++ b/lib/puppet/run.rb
@@ -3,7 +3,7 @@
require 'puppet/indirector'
# A basic class for running the agent. Used by
-# puppetrun to kick off agents remotely.
+# `puppet kick` to kick off agents remotely.
class Puppet::Run
extend Puppet::Indirector
indirects :run, :terminus_class => :local
diff --git a/lib/puppet/ssl/certificate_authority/interface.rb b/lib/puppet/ssl/certificate_authority/interface.rb
index 8f8371d..8fbe4a7 100644
--- a/lib/puppet/ssl/certificate_authority/interface.rb
+++ b/lib/puppet/ssl/certificate_authority/interface.rb
@@ -1,6 +1,5 @@
-# This class is basically a hidden class that knows how to act
-# on the CA. It's only used by the 'puppetca' executable, and its
-# job is to provide a CLI-like interface to the CA class.
+# This class is basically a hidden class that knows how to act on the
+# CA. Its job is to provide a CLI-like interface to the CA class.
module Puppet
module SSL
class CertificateAuthority
diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb
index 115ed39..3e3f73b 100644
--- a/lib/puppet/util/command_line.rb
+++ b/lib/puppet/util/command_line.rb
@@ -86,12 +86,6 @@ def execute_external_subcommand
exec(path_to_subcommand, *args)
end
- def legacy_executable_name
- name = CommandLine::LegacyCommandLine::LEGACY_NAMES[ subcommand_name.intern ]
- return name unless name.nil?
- return subcommand_name.intern
- end
-
private
def subcommand_and_args(zero, argv, stdin)
diff --git a/lib/puppet/util/command_line/legacy_command_line.rb b/lib/puppet/util/command_line/legacy_command_line.rb
deleted file mode 100644
index 161c5c0..0000000
--- a/lib/puppet/util/command_line/legacy_command_line.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-module Puppet
- module Util
- class CommandLine
- class LegacyCommandLine
-
- # A placeholder struct for storing a name/run_mode pair
- LegacyApp = Struct.new(:name, :run_mode)
- #class LegacyApp
- # attr_accessor :name, :run_mode
- # def initialize(name, run_mode)
- # @name = name
- # @run_mode = run_mode
- # end
- #end
-
- DefaultRunMode = :user
-
- LEGACY_APPS = {
- :puppetd => LegacyApp.new(:agent, :agent),
- :puppetca => LegacyApp.new(:cert, :master),
- :puppetdoc => LegacyApp.new(:doc, :master),
- :filebucket => LegacyApp.new(:filebucket, DefaultRunMode),
- :puppet => LegacyApp.new(:apply, DefaultRunMode),
- :pi => LegacyApp.new(:describe, DefaultRunMode),
- :puppetqd => LegacyApp.new(:queue, DefaultRunMode),
- :ralsh => LegacyApp.new(:resource, DefaultRunMode),
- :puppetrun => LegacyApp.new(:kick, DefaultRunMode),
- :puppetmasterd => LegacyApp.new(:master, :master),
- :puppetdevice => LegacyApp.new(:device, :agent),
- }
-
- LEGACY_NAMES = LEGACY_APPS.inject({}) do |result, entry|
- key, app = *entry
- result[app.name] = key
- result
- end
- end
- end
- end
-end
\ No newline at end of file
diff --git a/lib/puppet/util/constant_inflector.rb b/lib/puppet/util/constant_inflector.rb
index 128bbc9..ddc797a 100644
--- a/lib/puppet/util/constant_inflector.rb
+++ b/lib/puppet/util/constant_inflector.rb
@@ -5,15 +5,19 @@
# A common module for converting between constants and
# file names.
-module Puppet::Util::ConstantInflector
- def file2constant(file)
- # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com]
- x = file.split("/").collect { |name| name.capitalize }.join("::").gsub(/_+(.)/) { |term| $1.capitalize }
- end
- module_function :file2constant
+module Puppet
+ module Util
+ module ConstantInflector
+ def file2constant(file)
+ # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com]
+ x = file.split("/").collect { |name| name.capitalize }.join("::").gsub(/_+(.)/) { |term| $1.capitalize }
+ end
+ module_function :file2constant
- def constant2file(constant)
- constant.to_s.gsub(/([a-z])([A-Z])/) { |term| $1 + "_#{$2}" }.gsub("::", "/").downcase
+ def constant2file(constant)
+ constant.to_s.gsub(/([a-z])([A-Z])/) { |term| $1 + "_#{$2}" }.gsub("::", "/").downcase
+ end
+ module_function :constant2file
+ end
end
- module_function :constant2file
end
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index fc558f7..cec9ed1 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -738,16 +738,6 @@ def service_user_available?
@service_user_available = user.exists?
end
- def legacy_to_mode(type, param)
- require 'puppet/util/command_line/legacy_command_line'
- if Puppet::Util::CommandLine::LegacyCommandLine::LEGACY_APPS.has_key?(type)
- new_type = Puppet::Util::CommandLine::LegacyCommandLine::LEGACY_APPS[type].run_mode
- Puppet.deprecation_warning "You have configuration parameter $#{param} specified in [#{type}], which is a deprecated section. I'm assuming you meant [#{new_type}]"
- return new_type
- end
- type
- end
-
# Allow later inspection to determine if the setting was set on the
# command line, or through some other code path. Used for the
# `dns_alt_names` option during cert generate. --daniel 2011-10-18
@@ -773,7 +763,7 @@ def set_value(param, value, type, options = {})
raise ArgumentError,
"You're attempting to set configuration parameter $#{param}, which is read-only."
end
- type = legacy_to_mode(type, param)
+
@sync.synchronize do # yay, thread-safe
@values[type][param] = value
diff --git a/man/man8/filebucket.8 b/man/man8/filebucket.8
deleted file mode 100644
index 9907568..0000000
--- a/man/man8/filebucket.8
+++ /dev/null
@@ -1,81 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "PUPPET\-FILEBUCKET" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
-.
-.SH "NAME"
-\fBpuppet\-filebucket\fR \- Store and retrieve files in a filebucket
-.
-.SH "SYNOPSIS"
-A stand\-alone Puppet filebucket client\.
-.
-.SH "USAGE"
-puppet filebucket \fImode\fR [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose] [\-l|\-\-local] [\-r|\-\-remote] [\-s|\-\-server \fIserver\fR] [\-b|\-\-bucket \fIdirectory\fR] \fIfile\fR \fIfile\fR \.\.\.
-.
-.P
-Puppet filebucket can operate in three modes, with only one mode per call:
-.
-.P
-backup: Send one or more files to the specified file bucket\. Each sent file is printed with its resulting md5 sum\.
-.
-.P
-get: Return the text associated with an md5 sum\. The text is printed to stdout, and only one file can be retrieved at a time\.
-.
-.P
-restore: Given a file path and an md5 sum, store the content associated with the sum into the specified file path\. You can specify an entirely new path to this argument; you are not restricted to restoring the content to its original location\.
-.
-.SH "DESCRIPTION"
-This is a stand\-alone filebucket client for sending files to a local or central filebucket\.
-.
-.P
-Note that \'filebucket\' defaults to using a network\-based filebucket available on the server named \'puppet\'\. To use this, you\'ll have to be running as a user with valid Puppet certificates\. Alternatively, you can use your local file bucket by specifying \'\-\-local\'\.
-.
-.SH "OPTIONS"
-Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'ssldir\' is a valid configuration parameter, so you can specify \'\-\-ssldir \fIdirectory\fR\' as an argument\.
-.
-.P
-See the configuration file documentation at http://docs\.puppetlabs\.com/references/stable/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \'\-\-genconfig\'\.
-.
-.TP
-\-\-debug
-Enable full debugging\.
-.
-.TP
-\-\-help
-Print this help message
-.
-.TP
-\-\-local
-Use the local filebucket\. This will use the default configuration information\.
-.
-.TP
-\-\-remote
-Use a remote filebucket\. This will use the default configuration information\.
-.
-.TP
-\-\-server
-The server to send the file to, instead of locally\.
-.
-.TP
-\-\-verbose
-Print extra information\.
-.
-.TP
-\-\-version
-Print version information\.
-.
-.SH "EXAMPLE"
-.
-.nf
-
-$ puppet filebucket backup /etc/passwd
-/etc/passwd: 429b225650b912a2ee067b0a4cf1e949
-$ puppet filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949
-.
-.fi
-.
-.SH "AUTHOR"
-Luke Kanies
-.
-.SH "COPYRIGHT"
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/pi.8 b/man/man8/pi.8
deleted file mode 100644
index af246f1..0000000
--- a/man/man8/pi.8
+++ /dev/null
@@ -1,51 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "PUPPET\-DESCRIBE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
-.
-.SH "NAME"
-\fBpuppet\-describe\fR \- Display help about resource types
-.
-.SH "SYNOPSIS"
-Prints help about Puppet resource types, providers, and metaparameters\.
-.
-.SH "USAGE"
-puppet describe [\-h|\-\-help] [\-s|\-\-short] [\-p|\-\-providers] [\-l|\-\-list] [\-m|\-\-meta]
-.
-.SH "OPTIONS"
-.
-.TP
-\-\-help
-Print this help text
-.
-.TP
-\-\-providers
-Describe providers in detail for each type
-.
-.TP
-\-\-list
-List all types
-.
-.TP
-\-\-meta
-List all metaparameters
-.
-.TP
-\-\-short
-List only parameters without detail
-.
-.SH "EXAMPLE"
-.
-.nf
-
-$ puppet describe \-\-list
-$ puppet describe file \-\-providers
-$ puppet describe user \-s \-m
-.
-.fi
-.
-.SH "AUTHOR"
-David Lutterkort
-.
-.SH "COPYRIGHT"
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppetca.8 b/man/man8/puppetca.8
deleted file mode 100644
index 211f8ca..0000000
--- a/man/man8/puppetca.8
+++ /dev/null
@@ -1,97 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "PUPPET\-CERT" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
-.
-.SH "NAME"
-\fBpuppet\-cert\fR \- Manage certificates and requests
-.
-.SH "SYNOPSIS"
-Standalone certificate authority\. Capable of generating certificates, but mostly used for signing certificate requests from puppet clients\.
-.
-.SH "USAGE"
-puppet cert \fIaction\fR [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose] [\-\-digest \fIdigest\fR] [\fIhost\fR]
-.
-.SH "DESCRIPTION"
-Because the puppet master service defaults to not signing client certificate requests, this script is available for signing outstanding requests\. It can be used to list outstanding requests and then either sign them individually or sign all of them\.
-.
-.SH "ACTIONS"
-Every action except \'list\' and \'generate\' requires a hostname to act on, unless the \'\-\-all\' option is set\.
-.
-.TP
-clean
-Revoke a host\'s certificate (if applicable) and remove all files related to that host from puppet cert\'s storage\. This is useful when rebuilding hosts, since new certificate signing requests will only be honored if puppet cert does not have a copy of a signed certificate for that host\. If \'\-\-all\' is specified then all host certificates, both signed and unsigned, will be removed\.
-.
-.TP
-fingerprint
-Print the DIGEST (defaults to md5) fingerprint of a host\'s certificate\.
-.
-.TP
-generate
-Generate a certificate for a named client\. A certificate/keypair will be generated for each client named on the command line\.
-.
-.TP
-list
-List outstanding certificate requests\. If \'\-\-all\' is specified, signed certificates are also listed, prefixed by \'+\', and revoked or invalid certificates are prefixed by \'\-\' (the verification outcome is printed in parenthesis)\.
-.
-.TP
-print
-Print the full\-text version of a host\'s certificate\.
-.
-.TP
-revoke
-Revoke the certificate of a client\. The certificate can be specified either by its serial number (given as a decimal number or a hexadecimal number prefixed by \'0x\') or by its hostname\. The certificate is revoked by adding it to the Certificate Revocation List given by the \'cacrl\' configuration option\. Note that the puppet master needs to be restarted after revoking certificates\.
-.
-.TP
-sign
-Sign an outstanding certificate request\.
-.
-.TP
-verify
-Verify the named certificate against the local CA certificate\.
-.
-.SH "OPTIONS"
-Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'ssldir\' is a valid configuration parameter, so you can specify \'\-\-ssldir \fIdirectory\fR\' as an argument\.
-.
-.P
-See the configuration file documentation at http://docs\.puppetlabs\.com/references/stable/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet cert with \'\-\-genconfig\'\.
-.
-.TP
-\-\-all
-Operate on all items\. Currently only makes sense with the \'sign\', \'clean\', \'list\', and \'fingerprint\' actions\.
-.
-.TP
-\-\-digest
-Set the digest for fingerprinting (defaults to md5)\. Valid values depends on your openssl and openssl ruby extension version, but should contain at least md5, sha1, md2, sha256\.
-.
-.TP
-\-\-debug
-Enable full debugging\.
-.
-.TP
-\-\-help
-Print this help message
-.
-.TP
-\-\-verbose
-Enable verbosity\.
-.
-.TP
-\-\-version
-Print the puppet version number and exit\.
-.
-.SH "EXAMPLE"
-.
-.nf
-
-$ puppet cert list
-culain\.madstop\.com
-$ puppet cert sign culain\.madstop\.com
-.
-.fi
-.
-.SH "AUTHOR"
-Luke Kanies
-.
-.SH "COPYRIGHT"
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppetd.8 b/man/man8/puppetd.8
deleted file mode 100644
index 2e5cedf..0000000
--- a/man/man8/puppetd.8
+++ /dev/null
@@ -1,154 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "PUPPET\-AGENT" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
-.
-.SH "NAME"
-\fBpuppet\-agent\fR \- The puppet agent daemon
-.
-.SH "SYNOPSIS"
-Retrieves the client configuration from the puppet master and applies it to the local host\.
-.
-.P
-This service may be run as a daemon, run periodically using cron (or something similar), or run interactively for testing purposes\.
-.
-.SH "USAGE"
-puppet agent [\-D|\-\-daemonize|\-\-no\-daemonize] [\-d|\-\-debug] [\-\-detailed\-exitcodes] [\-\-disable] [\-\-enable] [\-h|\-\-help] [\-\-certname \fIhost name\fR] [\-l|\-\-logdest syslog|\fIfile\fR|console] [\-o|\-\-onetime] [\-\-serve \fIhandler\fR] [\-t|\-\-test] [\-\-noop] [\-\-digest \fIdigest\fR] [\-\-fingerprint] [\-V|\-\-version] [\-v|\-\-verbose] [\-w|\-\-waitforcert \fIseconds\fR]
-.
-.SH "DESCRIPTION"
-This is the main puppet client\. Its job is to retrieve the local machine\'s configuration from a remote server and apply it\. In order to successfully communicate with the remote server, the client must have a certificate signed by a certificate authority that the server trusts; the recommended method for this, at the moment, is to run a certificate authority as part of the puppet server (which is the default)\. The client will connect and request a signed certificate, and will continue connecting until it receives one\.
-.
-.P
-Once the client has a signed certificate, it will retrieve its configuration and apply it\.
-.
-.SH "USAGE NOTES"
-\'puppet agent\' does its best to find a compromise between interactive use and daemon use\. Run with no arguments and no configuration, it will go into the background, attempt to get a signed certificate, and retrieve and apply its configuration every 30 minutes\.
-.
-.P
-Some flags are meant specifically for interactive use \-\- in particular, \'test\', \'tags\' or \'fingerprint\' are useful\. \'test\' enables verbose logging, causes the daemon to stay in the foreground, exits if the server\'s configuration is invalid (this happens if, for instance, you\'ve left a syntax error on the server), and exits after running the configuration once (rather than hanging around as a long\-running process)\.
-.
-.P
-\'tags\' allows you to specify what portions of a configuration you want to apply\. Puppet elements are tagged with all of the class or definition names that contain them, and you can use the \'tags\' flag to specify one of these names, causing only configuration elements contained within that class or definition to be applied\. This is very useful when you are testing new configurations \-\- for instance, if you are just starting to manage \'ntpd\', you would put all of the new elements into an \'ntpd\' class, and call puppet with \'\-\-tags ntpd\', which would only apply that small portion of the configuration during your testing, rather than applying the whole thing\.
-.
-.P
-\'fingerprint\' is a one\-time flag\. In this mode \'puppet agent\' will run once and display on the console (and in the log) the current certificate (or certificate request) fingerprint\. Providing the \'\-\-digest\' option allows to use a different digest algorithm to generate the fingerprint\. The main use is to verify that before signing a certificate request on the master, the certificate request the master received is the same as the one the client sent (to prevent against man\-in\-the\-middle attacks when signing certificates)\.
-.
-.SH "OPTIONS"
-Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'server\' is a valid configuration parameter, so you can specify \'\-\-server \fIservername\fR\' as an argument\.
-.
-.P
-See the configuration file documentation at http://docs\.puppetlabs\.com/references/stable/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet agent with \'\-\-genconfig\'\.
-.
-.TP
-\-\-daemonize
-Send the process into the background\. This is the default\.
-.
-.TP
-\-\-no\-daemonize
-Do not send the process into the background\.
-.
-.TP
-\-\-debug
-Enable full debugging\.
-.
-.TP
-\-\-digest
-Change the certificate fingerprinting digest algorithm\. The default is MD5\. Valid values depends on the version of OpenSSL installed, but should always at least contain MD5, MD2, SHA1 and SHA256\.
-.
-.TP
-\-\-detailed\-exitcodes
-Provide transaction information via exit codes\. If this is enabled, an exit code of \'2\' means there were changes, and an exit code of \'4\' means that there were failures during the transaction\. This option only makes sense in conjunction with \-\-onetime\.
-.
-.TP
-\-\-disable
-Disable working on the local system\. This puts a lock file in place, causing \'puppet agent\' not to work on the system until the lock file is removed\. This is useful if you are testing a configuration and do not want the central configuration to override the local state until everything is tested and committed\.
-.
-.IP
-\'puppet agent\' uses the same lock file while it is running, so no more than one \'puppet agent\' process is working at a time\.
-.
-.IP
-\'puppet agent\' exits after executing this\.
-.
-.TP
-\-\-enable
-Enable working on the local system\. This removes any lock file, causing \'puppet agent\' to start managing the local system again (although it will continue to use its normal scheduling, so it might not start for another half hour)\.
-.
-.IP
-\'puppet agent\' exits after executing this\.
-.
-.TP
-\-\-certname
-Set the certname (unique ID) of the client\. The master reads this unique identifying string, which is usually set to the node\'s fully\-qualified domain name, to determine which configurations the node will receive\. Use this option to debug setup problems or implement unusual node identification schemes\.
-.
-.TP
-\-\-help
-Print this help message
-.
-.TP
-\-\-logdest
-Where to send messages\. Choose between syslog, the console, and a log file\. Defaults to sending messages to syslog, or the console if debugging or verbosity is enabled\.
-.
-.TP
-\-\-no\-client
-Do not create a config client\. This will cause the daemon to run without ever checking for its configuration automatically, and only makes sense
-.
-.TP
-\-\-onetime
-Run the configuration once\. Runs a single (normally daemonized) Puppet run\. Useful for interactively running puppet agent when used in conjunction with the \-\-no\-daemonize option\.
-.
-.TP
-\-\-fingerprint
-Display the current certificate or certificate signing request fingerprint and then exit\. Use the \'\-\-digest\' option to change the digest algorithm used\.
-.
-.TP
-\-\-serve
-Start another type of server\. By default, \'puppet agent\' will start a service handler that allows authenticated and authorized remote nodes to trigger the configuration to be pulled down and applied\. You can specify any handler here that does not require configuration, e\.g\., filebucket, ca, or resource\. The handlers are in \'lib/puppet/network/handler\', and the names must match exactly, both in the call to \'serve\' and in \'namespaceauth\.conf\'\.
-.
-.TP
-\-\-test
-Enable the most common options used for testing\. These are \'onetime\', \'verbose\', \'ignorecache\', \'no\-daemonize\', \'no\-usecacheonfailure\', \'detailed\-exit\-codes\', \'no\-splay\', and \'show_diff\'\.
-.
-.TP
-\-\-noop
-Use \'noop\' mode where the daemon runs in a no\-op or dry\-run mode\. This is useful for seeing what changes Puppet will make without actually executing the changes\.
-.
-.TP
-\-\-verbose
-Turn on verbose reporting\.
-.
-.TP
-\-\-version
-Print the puppet version number and exit\.
-.
-.TP
-\-\-waitforcert
-This option only matters for daemons that do not yet have certificates and it is enabled by default, with a value of 120 (seconds)\. This causes \'puppet agent\' to connect to the server every 2 minutes and ask it to sign a certificate request\. This is useful for the initial setup of a puppet client\. You can turn off waiting for certificates by specifying a time of 0\.
-.
-.SH "EXAMPLE"
-.
-.nf
-
-$ puppet agent \-\-server puppet\.domain\.com
-.
-.fi
-.
-.SH "DIAGNOSTICS"
-Puppet agent accepts the following signals:
-.
-.TP
-SIGHUP
-Restart the puppet agent daemon\.
-.
-.TP
-SIGINT and SIGTERM
-Shut down the puppet agent daemon\.
-.
-.TP
-SIGUSR1
-Immediately retrieve and apply configurations from the puppet master\.
-.
-.SH "AUTHOR"
-Luke Kanies
-.
-.SH "COPYRIGHT"
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppetdoc.8 b/man/man8/puppetdoc.8
deleted file mode 100644
index f6de395..0000000
--- a/man/man8/puppetdoc.8
+++ /dev/null
@@ -1,101 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "PUPPET\-DOC" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
-.
-.SH "NAME"
-\fBpuppet\-doc\fR \- Generate Puppet documentation and references
-.
-.SH "SYNOPSIS"
-Generates a reference for all Puppet types\. Largely meant for internal Puppet Labs use\.
-.
-.SH "USAGE"
-puppet doc [\-a|\-\-all] [\-h|\-\-help] [\-o|\-\-outputdir \fIrdoc\-outputdir\fR] [\-m|\-\-mode text|pdf|rdoc] [\-r|\-\-reference \fIreference\-name\fR] [\-\-charset \fIcharset\fR] [\fImanifest\-file\fR]
-.
-.SH "DESCRIPTION"
-If mode is not \'rdoc\', then this command generates a Markdown document describing all installed Puppet types or all allowable arguments to puppet executables\. It is largely meant for internal use and is used to generate the reference document available on the Puppet Labs web site\.
-.
-.P
-In \'rdoc\' mode, this command generates an html RDoc hierarchy describing the manifests that are in \'manifestdir\' and \'modulepath\' configuration directives\. The generated documentation directory is doc by default but can be changed with the \'outputdir\' option\.
-.
-.P
-If the command is run with the name of a manifest file as an argument, puppet doc will output a single manifest\'s documentation on stdout\.
-.
-.SH "OPTIONS"
-.
-.TP
-\-\-all
-Output the docs for all of the reference types\. In \'rdoc\' modes, this also outputs documentation for all resources
-.
-.TP
-\-\-help
-Print this help message
-.
-.TP
-\-\-outputdir
-Specifies the directory where to output the rdoc documentation in \'rdoc\' mode\.
-.
-.TP
-\-\-mode
-Determine the output mode\. Valid modes are \'text\', \'pdf\' and \'rdoc\'\. The \'pdf\' mode creates PDF formatted files in the /tmp directory\. The default mode is \'text\'\. In \'rdoc\' mode you must provide \'manifests\-path\'
-.
-.TP
-\-\-reference
-Build a particular reference\. Get a list of references by running \'puppet doc \-\-list\'\.
-.
-.TP
-\-\-charset
-Used only in \'rdoc\' mode\. It sets the charset used in the html files produced\.
-.
-.SH "EXAMPLE"
-.
-.nf
-
-$ puppet doc \-r type > /tmp/type_reference\.markdown
-.
-.fi
-.
-.P
-or
-.
-.IP "" 4
-.
-.nf
-
-$ puppet doc \-\-outputdir /tmp/rdoc \-\-mode rdoc /path/to/manifests
-.
-.fi
-.
-.IP "" 0
-.
-.P
-or
-.
-.IP "" 4
-.
-.nf
-
-$ puppet doc /etc/puppet/manifests/site\.pp
-.
-.fi
-.
-.IP "" 0
-.
-.P
-or
-.
-.IP "" 4
-.
-.nf
-
-$ puppet doc \-m pdf \-r configuration
-.
-.fi
-.
-.IP "" 0
-.
-.SH "AUTHOR"
-Luke Kanies
-.
-.SH "COPYRIGHT"
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppetmasterd.8 b/man/man8/puppetmasterd.8
deleted file mode 100644
index c38d34a..0000000
--- a/man/man8/puppetmasterd.8
+++ /dev/null
@@ -1,74 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "PUPPET\-MASTER" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
-.
-.SH "NAME"
-\fBpuppet\-master\fR \- The puppet master daemon
-.
-.SH "SYNOPSIS"
-The central puppet server\. Functions as a certificate authority by default\.
-.
-.SH "USAGE"
-puppet master [\-D|\-\-daemonize|\-\-no\-daemonize] [\-d|\-\-debug] [\-h|\-\-help] [\-l|\-\-logdest \fIfile\fR|console|syslog] [\-v|\-\-verbose] [\-V|\-\-version] [\-\-compile \fInode\-name\fR]
-.
-.SH "DESCRIPTION"
-This command starts an instance of puppet master, running as a daemon and using Ruby\'s built\-in Webrick webserver\. Puppet master can also be managed by other application servers; when this is the case, this executable is not used\.
-.
-.SH "OPTIONS"
-Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'ssldir\' is a valid configuration parameter, so you can specify \'\-\-ssldir \fIdirectory\fR\' as an argument\.
-.
-.P
-See the configuration file documentation at http://docs\.puppetlabs\.com/references/stable/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet master with \'\-\-genconfig\'\.
-.
-.TP
-\-\-daemonize
-Send the process into the background\. This is the default\.
-.
-.TP
-\-\-no\-daemonize
-Do not send the process into the background\.
-.
-.TP
-\-\-debug
-Enable full debugging\.
-.
-.TP
-\-\-help
-Print this help message\.
-.
-.TP
-\-\-logdest
-Where to send messages\. Choose between syslog, the console, and a log file\. Defaults to sending messages to syslog, or the console if debugging or verbosity is enabled\.
-.
-.TP
-\-\-verbose
-Enable verbosity\.
-.
-.TP
-\-\-version
-Print the puppet version number and exit\.
-.
-.TP
-\-\-compile
-Compile a catalogue and output it in JSON from the puppet master\. Uses facts contained in the $vardir/yaml/ directory to compile the catalog\.
-.
-.SH "EXAMPLE"
-puppet master
-.
-.SH "DIAGNOSTICS"
-When running as a standalone daemon, puppet master accepts the following signals:
-.
-.TP
-SIGHUP
-Restart the puppet master server\.
-.
-.TP
-SIGINT and SIGTERM
-Shut down the puppet master server\.
-.
-.SH "AUTHOR"
-Luke Kanies
-.
-.SH "COPYRIGHT"
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppetqd.8 b/man/man8/puppetqd.8
deleted file mode 100644
index 1a3241c..0000000
--- a/man/man8/puppetqd.8
+++ /dev/null
@@ -1,55 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "PUPPET\-QUEUE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
-.
-.SH "NAME"
-\fBpuppet\-queue\fR \- Queuing daemon for asynchronous storeconfigs
-.
-.SH "SYNOPSIS"
-Retrieves serialized storeconfigs records from a queue and processes them in order\.
-.
-.SH "USAGE"
-puppet queue [\-d|\-\-debug] [\-v|\-\-verbose]
-.
-.SH "DESCRIPTION"
-This application runs as a daemon and processes storeconfigs data, retrieving the data from a stomp server message queue and writing it to a database\.
-.
-.P
-For more information, including instructions for properly setting up your puppet master and message queue, see the documentation on setting up asynchronous storeconfigs at: http://projects\.puppetlabs\.com/projects/1/wiki/Using_Stored_Configuration
-.
-.SH "OPTIONS"
-Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'server\' is a valid configuration parameter, so you can specify \'\-\-server \fIservername\fR\' as an argument\.
-.
-.P
-See the configuration file documentation at http://docs\.puppetlabs\.com/references/stable/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet queue with \'\-\-genconfig\'\.
-.
-.TP
-\-\-debug
-Enable full debugging\.
-.
-.TP
-\-\-help
-Print this help message
-.
-.TP
-\-\-verbose
-Turn on verbose reporting\.
-.
-.TP
-\-\-version
-Print the puppet version number and exit\.
-.
-.SH "EXAMPLE"
-.
-.nf
-
-$ puppet queue
-.
-.fi
-.
-.SH "AUTHOR"
-Luke Kanies
-.
-.SH "COPYRIGHT"
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppetrun.8 b/man/man8/puppetrun.8
deleted file mode 100644
index 2b75023..0000000
--- a/man/man8/puppetrun.8
+++ /dev/null
@@ -1,95 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "PUPPET\-KICK" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
-.
-.SH "NAME"
-\fBpuppet\-kick\fR \- Remotely control puppet agent
-.
-.SH "SYNOPSIS"
-Trigger a puppet agent run on a set of hosts\.
-.
-.SH "USAGE"
-puppet kick [\-a|\-\-all] [\-c|\-\-class \fIclass\fR] [\-d|\-\-debug] [\-f|\-\-foreground] [\-h|\-\-help] [\-\-host \fIhost\fR] [\-\-no\-fqdn] [\-\-ignoreschedules] [\-t|\-\-tag \fItag\fR] [\-\-test] [\-p|\-\-ping] \fIhost\fR [\fIhost\fR [\.\.\.]]
-.
-.SH "DESCRIPTION"
-This script can be used to connect to a set of machines running \'puppet agent\' and trigger them to run their configurations\. The most common usage would be to specify a class of hosts and a set of tags, and \'puppet kick\' would look up in LDAP all of the hosts matching that class, then connect to each host and trigger a run of all of the objects with the specified tags\.
-.
-.P
-If you are not storing your host configurations in LDAP, you can specify hosts manually\.
-.
-.P
-You will most likely have to run \'puppet kick\' as root to get access to the SSL certificates\.
-.
-.P
-\'puppet kick\' reads \'puppet master\'\'s configuration file, so that it can copy things like LDAP settings\.
-.
-.SH "USAGE NOTES"
-Puppet kick is useless unless puppet agent is listening for incoming connections and allowing access to the \fBrun\fR endpoint\. This entails starting the agent with \fBlisten = true\fR in its puppet\.conf file, and allowing access to the \fB/run\fR path in its auth\.conf file; see \fBhttp://docs\.puppetlabs\.com/guides/rest_auth_conf\.html\fR for more details\.
-.
-.P
-Additionally, due to a known bug, you must make sure a namespaceauth\.conf file exists in puppet agent\'s $confdir\. This file will not be consulted, and may be left empty\.
-.
-.SH "OPTIONS"
-Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'ssldir\' is a valid configuration parameter, so you can specify \'\-\-ssldir \fIdirectory\fR\' as an argument\.
-.
-.P
-See the configuration file documentation at http://docs\.puppetlabs\.com/references/latest/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet master with \'\-\-genconfig\'\.
-.
-.TP
-\-\-all
-Connect to all available hosts\. Requires LDAP support at this point\.
-.
-.TP
-\-\-class
-Specify a class of machines to which to connect\. This only works if you have LDAP configured, at the moment\.
-.
-.TP
-\-\-debug
-Enable full debugging\.
-.
-.TP
-\-\-foreground
-Run each configuration in the foreground; that is, when connecting to a host, do not return until the host has finished its run\. The default is false\.
-.
-.TP
-\-\-help
-Print this help message
-.
-.TP
-\-\-host
-A specific host to which to connect\. This flag can be specified more than once\.
-.
-.TP
-\-\-ignoreschedules
-Whether the client should ignore schedules when running its configuration\. This can be used to force the client to perform work it would not normally perform so soon\. The default is false\.
-.
-.TP
-\-\-parallel
-How parallel to make the connections\. Parallelization is provided by forking for each client to which to connect\. The default is 1, meaning serial execution\.
-.
-.TP
-\-\-tag
-Specify a tag for selecting the objects to apply\. Does not work with the \-\-test option\.
-.
-.TP
-\-\-test
-Print the hosts you would connect to but do not actually connect\. This option requires LDAP support at this point\.
-.
-.TP
-\-\-ping
-Do a ICMP echo against the target host\. Skip hosts that don\'t respond to ping\.
-.
-.SH "EXAMPLE"
-.
-.nf
-
-$ sudo puppet kick \-p 10 \-t remotefile \-t webserver host1 host2
-.
-.fi
-.
-.SH "AUTHOR"
-Luke Kanies
-.
-.SH "COPYRIGHT"
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/ralsh.8 b/man/man8/ralsh.8
deleted file mode 100644
index 7e09c07..0000000
--- a/man/man8/ralsh.8
+++ /dev/null
@@ -1,84 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "PUPPET\-RESOURCE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
-.
-.SH "NAME"
-\fBpuppet\-resource\fR \- The resource abstraction layer shell
-.
-.SH "SYNOPSIS"
-Uses the Puppet RAL to directly interact with the system\.
-.
-.SH "USAGE"
-puppet resource [\-h|\-\-help] [\-d|\-\-debug] [\-v|\-\-verbose] [\-e|\-\-edit] [\-H|\-\-host \fIhost\fR] [\-p|\-\-param \fIparameter\fR] [\-t|\-\-types] \fItype\fR [\fIname\fR] [\fIattribute\fR=\fIvalue\fR \.\.\.]
-.
-.SH "DESCRIPTION"
-This command provides simple facilities for converting current system state into Puppet code, along with some ability to modify the current state using Puppet\'s RAL\.
-.
-.P
-By default, you must at least provide a type to list, in which case puppet resource will tell you everything it knows about all resources of that type\. You can optionally specify an instance name, and puppet resource will only describe that single instance\.
-.
-.P
-If given a type, a name, and a series of \fIattribute\fR=\fIvalue\fR pairs, puppet resource will modify the state of the specified resource\. Alternately, if given a type, a name, and the \'\-\-edit\' flag, puppet resource will write its output to a file, open that file in an editor, and then apply the saved file as a Puppet transaction\.
-.
-.SH "OPTIONS"
-Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'ssldir\' is a valid configuration parameter, so you can specify \'\-\-ssldir \fIdirectory\fR\' as an argument\.
-.
-.P
-See the configuration file documentation at http://docs\.puppetlabs\.com/references/stable/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \'\-\-genconfig\'\.
-.
-.TP
-\-\-debug
-Enable full debugging\.
-.
-.TP
-\-\-edit
-Write the results of the query to a file, open the file in an editor, and read the file back in as an executable Puppet manifest\.
-.
-.TP
-\-\-host
-When specified, connect to the resource server on the named host and retrieve the list of resouces of the type specified\.
-.
-.TP
-\-\-help
-Print this help message\.
-.
-.TP
-\-\-param
-Add more parameters to be outputted from queries\.
-.
-.TP
-\-\-types
-List all available types\.
-.
-.TP
-\-\-verbose
-Print extra information\.
-.
-.SH "EXAMPLE"
-This example uses \fBpuppet resource\fR to return a Puppet configuration for the user \fBluke\fR:
-.
-.IP "" 4
-.
-.nf
-
-$ puppet resource user luke
-user { \'luke\':
- home => \'/home/luke\',
- uid => \'100\',
- ensure => \'present\',
- comment => \'Luke Kanies,,,\',
- gid => \'1000\',
- shell => \'/bin/bash\',
- groups => [\'sysadmin\',\'audio\',\'video\',\'puppet\']
-}
-.
-.fi
-.
-.IP "" 0
-.
-.SH "AUTHOR"
-Luke Kanies
-.
-.SH "COPYRIGHT"
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/sbin/puppetca b/sbin/puppetca
deleted file mode 100755
index 255680e..0000000
--- a/sbin/puppetca
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'puppet/application/cert'
-Puppet::Application[:cert].run
diff --git a/sbin/puppetd b/sbin/puppetd
deleted file mode 100755
index f0605c8..0000000
--- a/sbin/puppetd
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'puppet/application/agent'
-Puppet::Application[:agent].run
diff --git a/sbin/puppetmasterd b/sbin/puppetmasterd
deleted file mode 100755
index 70c8011..0000000
--- a/sbin/puppetmasterd
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'puppet/application/master'
-Puppet::Application[:master].run
diff --git a/sbin/puppetqd b/sbin/puppetqd
deleted file mode 100755
index 10f7800..0000000
--- a/sbin/puppetqd
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'puppet/application/queue'
-Puppet::Application[:queue].run
diff --git a/sbin/puppetrun b/sbin/puppetrun
deleted file mode 100755
index 47b2245..0000000
--- a/sbin/puppetrun
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'puppet/application/kick'
-Puppet::Application[:kick].run
-
diff --git a/spec/unit/util/command_line_spec.rb b/spec/unit/util/command_line_spec.rb
index f608c13..5ebb89a 100755
--- a/spec/unit/util/command_line_spec.rb
+++ b/spec/unit/util/command_line_spec.rb
@@ -75,16 +75,6 @@
command_line.subcommand_name.should == "puppetmasterd"
end
- it "should translate subcommand names into their legacy equivalent" do
- command_line = Puppet::Util::CommandLine.new("puppet", ["master"], @tty)
- command_line.legacy_executable_name.should == :puppetmasterd
- end
-
- it "should leave legacy command names alone" do
- command_line = Puppet::Util::CommandLine.new("puppetmasterd", [], @tty)
- command_line.legacy_executable_name.should == :puppetmasterd
- end
-
describe "when the subcommand is not implemented" do
it "should find and invoke an executable with a hyphenated name" do
commandline = Puppet::Util::CommandLine.new("puppet", ['whatever', 'argument'], @tty)
diff --git a/spec/unit/util/settings_spec.rb b/spec/unit/util/settings_spec.rb
index d55cf23..a993073 100755
--- a/spec/unit/util/settings_spec.rb
+++ b/spec/unit/util/settings_spec.rb
@@ -448,22 +448,6 @@
@settings[:one] = "foo"
}.should raise_error(ArgumentError, /read-only/)
end
-
- it "should warn and use [master] if we ask for [puppetmasterd]" do
- Puppet.expects(:deprecation_warning)
- @settings.set_value(:myval, "foo", :puppetmasterd)
-
- @settings.stubs(:run_mode).returns(:master)
- @settings.value(:myval).should == "foo"
- end
-
- it "should warn and use [agent] if we ask for [puppetd]" do
- Puppet.expects(:deprecation_warning)
- @settings.set_value(:myval, "foo", :puppetd)
-
- @settings.stubs(:run_mode).returns(:agent)
- @settings.value(:myval).should == "foo"
- end
end
describe "when returning values" do
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
