summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2010-04-14 18:46:52 +1000
committerJames Turnbull <james@lovedthanlost.net>2010-04-17 18:11:36 +1000
commitf351e2dcf0c133c7e800f09f9a6f65146d856bde (patch)
tree5d4f4922943d3240a3f8e686f35c6ee96e02e434 /lib
parentcf7e6967632ba3f1d3b7ae21ccaf5daed9cec6e7 (diff)
downloadpuppet-f351e2dcf0c133c7e800f09f9a6f65146d856bde.tar.gz
puppet-f351e2dcf0c133c7e800f09f9a6f65146d856bde.tar.xz
puppet-f351e2dcf0c133c7e800f09f9a6f65146d856bde.zip
Renamed all references to Reductive Labs to Puppet Labs
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/defaults.rb8
-rwxr-xr-xlib/puppet/network/authstore.rb6
-rw-r--r--lib/puppet/provider/macauthorization/macauthorization.rb2
-rwxr-xr-xlib/puppet/provider/service/debian.rb4
-rw-r--r--lib/puppet/reference/providers.rb2
-rwxr-xr-xlib/puppet/type/exec.rb2
-rw-r--r--lib/puppet/type/file.rb2
-rw-r--r--lib/puppet/util/nagios_maker.rb2
8 files changed, 14 insertions, 14 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index e78b20fe2..d33353585 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -450,12 +450,12 @@ module Puppet
directories.", :type => :setting }, # We don't want this to be considered a file, since it's multiple files.
:ssl_client_header => ["HTTP_X_CLIENT_DN", "The header containing an authenticated
client's SSL DN. Only used with Mongrel. This header must be set by the proxy
- to the authenticated client's SSL DN (e.g., ``/CN=puppet.reductivelabs.com``).
- See http://reductivelabs.com/puppet/trac/wiki/UsingMongrel for more information."],
+ to the authenticated client's SSL DN (e.g., ``/CN=puppet.puppetlabs.com``).
+ See http://puppetlabs.com/puppet/trac/wiki/UsingMongrel for more information."],
:ssl_client_verify_header => ["HTTP_X_CLIENT_VERIFY", "The header containing the status
message of the client verification. Only used with Mongrel. This header must be set by the proxy
to 'SUCCESS' if the client successfully authenticated, and anything else otherwise.
- See http://reductivelabs.com/puppet/trac/wiki/UsingMongrel for more information."],
+ See http://puppetlabs.com/puppet/trac/wiki/UsingMongrel for more information."],
# To make sure this directory is created before we try to use it on the server, we need
# it to be in the server section (#1138).
:yamldir => {:default => "$vardir/yaml", :owner => "service", :group => "service", :mode => "750",
@@ -727,7 +727,7 @@ module Puppet
setdefaults(:ldap,
:ldapnodes => [false,
"Whether to search for node configurations in LDAP. See
- http://reductivelabs.com/trac/puppet/wiki/LDAPNodes for more information."],
+ http://puppetlabs.com/trac/puppet/wiki/LDAPNodes for more information."],
:ldapssl => [false,
"Whether SSL should be used when searching for nodes.
Defaults to false because SSL usually requires certificates
diff --git a/lib/puppet/network/authstore.rb b/lib/puppet/network/authstore.rb
index a7029a0a0..d5ba3ef78 100755
--- a/lib/puppet/network/authstore.rb
+++ b/lib/puppet/network/authstore.rb
@@ -183,9 +183,9 @@ module Puppet
# interpolate a pattern to replace any
# backreferences by the given match
- # for instance if our pattern is $1.reductivelabs.com
+ # for instance if our pattern is $1.puppetlabs.com
# and we're called with a MatchData whose capture 1 is puppet
- # we'll return a pattern of puppet.reductivelabs.com
+ # we'll return a pattern of puppet.puppetlabs.com
def interpolate(match)
clone = dup
clone.pattern = clone.pattern.reverse.collect do |p|
@@ -242,7 +242,7 @@ module Puppet
when /^\*(\.(\w[-\w]*)){1,}$/ # *.domain.com
host_sans_star = munge_name(value)[0..-2]
[:domain,:inexact,host_sans_star.length,host_sans_star]
- when /\$\d+/ # a backreference pattern ala $1.reductivelabs.com or 192.168.0.$1 or $1.$2
+ when /\$\d+/ # a backreference pattern ala $1.puppetlabs.com or 192.168.0.$1 or $1.$2
[:dynamic,:exact,nil,munge_name(value)]
when /^\w[-.@\w]*$/ # ? Just like a host name but allow '@'s and ending '.'s
[:opaque,:exact,nil,[value]]
diff --git a/lib/puppet/provider/macauthorization/macauthorization.rb b/lib/puppet/provider/macauthorization/macauthorization.rb
index d1e2b229f..bc2dfb176 100644
--- a/lib/puppet/provider/macauthorization/macauthorization.rb
+++ b/lib/puppet/provider/macauthorization/macauthorization.rb
@@ -15,7 +15,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
confine :operatingsystem => :darwin
# This should be confined based on macosx_productversion once
- # http://projects.reductivelabs.com/issues/show/1796
+ # http://projects.puppetlabs.com/issues/show/1796
# is resolved.
if FileTest.exists?("/usr/bin/sw_vers")
product_version = sw_vers "-productVersion"
diff --git a/lib/puppet/provider/service/debian.rb b/lib/puppet/provider/service/debian.rb
index 51fb7a22b..1f9dc5ab6 100755
--- a/lib/puppet/provider/service/debian.rb
+++ b/lib/puppet/provider/service/debian.rb
@@ -10,7 +10,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
commands :update_rc => "/usr/sbin/update-rc.d"
# note this isn't being used as a command until
- # http://projects.reductivelabs.com/issues/2538
+ # http://projects.puppetlabs.com/issues/2538
# is resolved.
commands :invoke_rc => "/usr/sbin/invoke-rc.d"
@@ -28,7 +28,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
def enabled?
# TODO: Replace system() call when Puppet::Util.execute gives us a way
- # to determine exit status. http://projects.reductivelabs.com/issues/2538
+ # to determine exit status. http://projects.puppetlabs.com/issues/2538
system("/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start")
# 104 is the exit status when you query start an enabled service.
diff --git a/lib/puppet/reference/providers.rb b/lib/puppet/reference/providers.rb
index d425d803e..884e34f7e 100644
--- a/lib/puppet/reference/providers.rb
+++ b/lib/puppet/reference/providers.rb
@@ -96,7 +96,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
ret += h(type.name.to_s + "_", 2)
- ret += ".. _%s: %s\n\n" % [type.name, "http://reductivelabs.com/trac/puppet/wiki/TypeReference#%s" % type.name]
+ ret += ".. _%s: %s\n\n" % [type.name, "http://puppetlabs.com/trac/puppet/wiki/TypeReference#%s" % type.name]
ret += option("Default provider", default)
ret += doctable(headers, table_data)
diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb
index a68bfb189..64b6f2d39 100755
--- a/lib/puppet/type/exec.rb
+++ b/lib/puppet/type/exec.rb
@@ -52,7 +52,7 @@ module Puppet
in the short term, it is highly recommended to migrate work from ``exec``
to native Puppet types as quickly as possible. If you find that
you are doing a lot of work with ``exec``, please at least notify
- us at Reductive Labs what you are doing, and hopefully we can work with
+ us at Puppet Labs what you are doing, and hopefully we can work with
you to get a native resource type for the work you are doing."
require 'open3'
diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb
index fdb5a3578..0aaad3e97 100644
--- a/lib/puppet/type/file.rb
+++ b/lib/puppet/type/file.rb
@@ -22,7 +22,7 @@ module Puppet
If you find that you are often copying files in from a central
location, rather than using native resources, please contact
- Reductive Labs and we can hopefully work with you to develop a
+ Puppet Labs and we can hopefully work with you to develop a
native resource to support what you are doing."
newparam(:path) do
diff --git a/lib/puppet/util/nagios_maker.rb b/lib/puppet/util/nagios_maker.rb
index 339d2d1a2..d7044f2c8 100644
--- a/lib/puppet/util/nagios_maker.rb
+++ b/lib/puppet/util/nagios_maker.rb
@@ -55,7 +55,7 @@ module Puppet::Util::NagiosMaker
You can purge Nagios resources using the ``resources`` type, but *only*
in the default file locations. This is an architectural limitation.
- .. _naginator: http://projects.reductivelabs.com/projects/naginator
+ .. _naginator: http://projects.puppetlabs.com/projects/naginator
"
end
end