Signed-off-by: James Turnbull <[email protected]> --- CHANGELOG | 6 +++--- CHANGELOG.old | 4 ++-- LICENSE | 2 +- README | 4 ++-- README.queueing | 2 +- README.rst | 4 ++-- bin/filebucket | 2 +- bin/puppet | 2 +- bin/ralsh | 2 +- conf/osx/PackageInfo.plist | 2 +- conf/redhat/puppet.spec | 4 ++-- conf/solaris/pkginfo | 4 ++-- conf/solaris/smf/puppetd.xml | 6 +++--- conf/solaris/smf/puppetmasterd.xml | 6 +++--- conf/suse/puppet.spec | 4 ++-- examples/modules/sample-module/README.txt | 6 +++--- .../lib/puppet/parser/functions/hostname_to_dn.rb | 2 +- ext/extlookup.rb | 2 +- ext/nagios/naggen | 2 +- ext/puppet-test | 2 +- ext/puppetstoredconfigclean.rb | 2 +- ext/regexp_nodes/regexp_nodes.rb | 2 +- lib/puppet/defaults.rb | 8 ++++---- lib/puppet/network/authstore.rb | 6 +++--- .../provider/macauthorization/macauthorization.rb | 2 +- lib/puppet/provider/service/debian.rb | 4 ++-- lib/puppet/reference/providers.rb | 2 +- lib/puppet/util/nagios_maker.rb | 2 +- man/man5/puppet.conf.5 | 6 +++--- man/man8/filebucket.8 | 2 +- man/man8/puppet.8 | 2 +- man/man8/puppetca.8 | 2 +- man/man8/puppetd.8 | 2 +- man/man8/puppetmasterd.8 | 2 +- man/man8/puppetqd.8 | 2 +- man/man8/puppetrun.8 | 2 +- man/man8/ralsh.8 | 2 +- sbin/puppetca | 2 +- sbin/puppetd | 2 +- sbin/puppetmasterd | 2 +- sbin/puppetqd | 2 +- sbin/puppetrun | 2 +- spec/unit/application/filebucket.rb | 4 ++-- spec/unit/application/puppetd.rb | 4 ++-- spec/unit/parser/ast/leaf.rb | 4 ++-- spec/unit/provider/ssh_authorized_key/parsed.rb | 2 +- tasks/rake/gem.rake | 4 ++-- tasks/rake/git_workflow.rake | 4 ++-- .../ssh_authorized_key/parsed/authorized_keys | 2 +- test/network/handler/ca.rb | 8 ++++---- 50 files changed, 80 insertions(+), 80 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG index 7f8e0e5..c9d02c8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1259,7 +1259,7 @@ d5850dc Refactored a method: extracted about five other methods c55ac3f Fix #2010 - add protection code for some storeconfig corruption a790ee3 Further fix to #1910 9577d3a Fixing #2013 - prefetching had a mismatch between type and title -719a8df Fixed to rake tests for reductivelabs build +719a8df Fixed to rake tests for puppetlabs build ac87600 Fixed report reference page 0c16426 Fixing broken 0.24.x tests in test/. 23066c1 Fixing every failing test I can find on the build server. @@ -1345,7 +1345,7 @@ d5850dc Refactored a method: extracted about five other methods c55ac3f Fix #2010 - add protection code for some storeconfig corruption a790ee3 Further fix to #1910 9577d3a Fixing #2013 - prefetching had a mismatch between type and title -719a8df Fixed to rake tests for reductivelabs build +719a8df Fixed to rake tests for puppetlabs build ac87600 Fixed report reference page 0c16426 Fixing broken 0.24.x tests in test/. 23066c1 Fixing every failing test I can find on the build server. @@ -3078,7 +3078,7 @@ f8a0e99 Adding the functionality requested in http://mail.madstop.com/pipermail b6d0d27 Adding a --version argument to puppetca da4d252 Changing the test package for debian b8b14d3 Forgot to change Puppet::Util::SUIDManager#run_and_capture arguments to execute -efe9a83 Fix for #565: Final merge of changes from source:branches/execute-refactor into source:trunk Generated with svn merge -r 2378:HEAD https://reductivelabs.com/svn/puppet/branches/execute-refactor trunk +efe9a83 Fix for #565: Final merge of changes from source:branches/execute-refactor into source:trunk Generated with svn merge -r 2378:HEAD https://puppetlabs.com/svn/puppet/branches/execute-refactor trunk 8ab2722 Hah! Finally fixing the problem where mount tests would fail when run as part of the whole suite. The real problem was that I was changing the filetype of the provider without setting it to change back after the test, but the key change that made it straightforward to fix this problem was that my test loader was not exiting with a non-zero code when there was a failure, which mean that the ./test script never thought anything failed. I fixed the former, then fixed the test script to work fine with -n method_name stuff, and quickly found the problem. *whew* f9d89b5 Changing the date that certs are valid to start one day before the cert is created, so clocks that are off by a little bit can still be used. 4615e3a Fixing Client.read_cert so that it automatically adds the certificate information to the driver when the certificate is correctly read. This makes sure the Net::Http instance has the cert all set up. diff --git a/CHANGELOG.old b/CHANGELOG.old index bb0be94..ce3d8ed 100644 --- a/CHANGELOG.old +++ b/CHANGELOG.old @@ -1,6 +1,6 @@ This is the legacy CHANGELOG. Please see the new ChangeLog file and the ReleaseNotes page at: -http://reductivelabs.com/trac/puppet/wiki/ReleaseNotes +http://puppetlabs.com/trac/puppet/wiki/ReleaseNotes 0.25.0 Fixed #2280 - Detailed exit codes fix @@ -210,7 +210,7 @@ http://reductivelabs.com/trac/puppet/wiki/ReleaseNotes Added augeas type Added support for @doc type and manifest documentation support - see: - http://reductivelabs.com/trac/puppet/wiki/PuppetManifestDocumentation + http://puppetlabs.com/trac/puppet/wiki/PuppetManifestDocumentation Added multiline comment support diff --git a/LICENSE b/LICENSE index 57d96f8..9ede191 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ Puppet - Automating Configuration Management. Copyright (C) 2005 Reductive Labs LLC -Reductive Labs can be contacted at: [email protected] +Reductive Labs can be contacted at: [email protected] This program and entire repository is free software; you can redistribute it and/or modify it under the terms of the GNU diff --git a/README b/README index 7b6a3af..8b16844 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ Documentation (and detailed install instructions) can be found -online at http://reductivelabs.com/trac/puppet/wiki/DocumentationStart . +online at http://puppetlabs.com/trac/puppet/wiki/DocumentationStart . Generally, you need the following things installed: @@ -22,6 +22,6 @@ Generally, you need the following things installed: the library. * Facter => 1.5.1 - You can get this from < http://reductivelabs.com/projects/facter > + You can get this from < http://puppetlabs.com/projects/facter > $Id$ diff --git a/README.queueing b/README.queueing index 8c4a180..e8be38a 100644 --- a/README.queueing +++ b/README.queueing @@ -8,7 +8,7 @@ Queue Daemon). Currently this is only supported for "Storeconfigs" which is documented at: -http://reductivelabs.com/trac/puppet/wiki/UsingStoredConfiguration +http://puppetlabs.com/trac/puppet/wiki/UsingStoredConfiguration In the future this feature can be extended to any new puppet data which involves storage in a database. diff --git a/README.rst b/README.rst index 7e34d0d..f03621b 100644 --- a/README.rst +++ b/README.rst @@ -34,5 +34,5 @@ Generally, you need the following things installed: * Facter => 1.1.1 You can get this from your package management system or the `Facter site`_ -.. _Puppet Wiki: http://reductivelabs.com/trac/puppet/wiki/DocumentationStart -.. _Facter site: http://reductivelabs.com/projects/facter +.. _Puppet Wiki: http://puppetlabs.com/trac/puppet/wiki/DocumentationStart +.. _Facter site: http://puppetlabs.com/projects/facter diff --git a/bin/filebucket b/bin/filebucket index 1c5daa4..5240e42 100755 --- a/bin/filebucket +++ b/bin/filebucket @@ -53,7 +53,7 @@ # parameter, so you can specify '--ssldir <directory>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for +# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for # the full list of acceptable parameters. A commented list of all # configuration options can also be generated by running puppet with # '--genconfig'. diff --git a/bin/puppet b/bin/puppet index 931e3a9..35b00ad 100755 --- a/bin/puppet +++ b/bin/puppet @@ -23,7 +23,7 @@ # parameter, so you can specify '--ssldir <directory>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for +# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for # the full list of acceptable parameters. A commented list of all # configuration options can also be generated by running puppet with # '--genconfig'. diff --git a/bin/ralsh b/bin/ralsh index ca20c4c..b1c5f35 100755 --- a/bin/ralsh +++ b/bin/ralsh @@ -33,7 +33,7 @@ # parameter, so you can specify '--ssldir <directory>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for +# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for # the full list of acceptable parameters. A commented list of all # configuration options can also be generated by running puppet with # '--genconfig'. diff --git a/conf/osx/PackageInfo.plist b/conf/osx/PackageInfo.plist index 08930e1..947aabb 100644 --- a/conf/osx/PackageInfo.plist +++ b/conf/osx/PackageInfo.plist @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>CFBundleIdentifier</key> - <string>com.reductivelabs.puppet</string> + <string>com.puppetlabs.puppet</string> <key>CFBundleShortVersionString</key> <string>{SHORTVERSION}</string> <key>IFMajorVersion</key> diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec index aaebd51..3c22e8a 100644 --- a/conf/redhat/puppet.spec +++ b/conf/redhat/puppet.spec @@ -9,8 +9,8 @@ Version: 0.25.2 Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: GPLv2+ -URL: http://puppet.reductivelabs.com/ -Source0: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tar.gz +URL: http://puppet.puppetlabs.com/ +Source0: http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz Patch0: rundir-perms.patch Group: System Environment/Base diff --git a/conf/solaris/pkginfo b/conf/solaris/pkginfo index 7f7bb97..d3762ba 100644 --- a/conf/solaris/pkginfo +++ b/conf/solaris/pkginfo @@ -2,6 +2,6 @@ PKG=CSWpuppet NAME=puppet - System Automation Framework VERSION=0.23.0 CATEGORY=application -VENDOR=http://reductivelabs.com/projects/puppet -HOTLINE=http://reductivelabs.com/cgi-bin/puppet.cgi +VENDOR=http://puppetlabs.com/projects/puppet +HOTLINE=http://puppetlabs.com/cgi-bin/puppet.cgi [email protected] diff --git a/conf/solaris/smf/puppetd.xml b/conf/solaris/smf/puppetd.xml index 84ee008..dc4ac2e 100644 --- a/conf/solaris/smf/puppetd.xml +++ b/conf/solaris/smf/puppetd.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> -<!-- Puppetd Manifest: Luke Kanies - reductivelabs.com --> +<!-- Puppetd Manifest: Luke Kanies - puppetlabs.com --> <service_bundle type='manifest' name='puppetd'> @@ -68,8 +68,8 @@ </common_name> <documentation> <manpage title='puppetd' section='1' /> - <doc_link name='reductivelabs.com' - uri='http://www.reductivelabs.com/projects/puppet' /> + <doc_link name='puppetlabs.com' + uri='http://www.puppetlabs.com/projects/puppet' /> </documentation> </template> </service> diff --git a/conf/solaris/smf/puppetmasterd.xml b/conf/solaris/smf/puppetmasterd.xml index e7b0113..c0a82f3 100644 --- a/conf/solaris/smf/puppetmasterd.xml +++ b/conf/solaris/smf/puppetmasterd.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> -<!-- PuppetMasterd Manifest: Luke Kanies - reductivelabs.com --> +<!-- PuppetMasterd Manifest: Luke Kanies - puppetlabs.com --> <service_bundle type='manifest' name='puppetmasterd'> @@ -68,8 +68,8 @@ </common_name> <documentation> <manpage title='puppetmasterd' section='1' /> - <doc_link name='reductivelabs.com' - uri='http://www.reductivelabs.com/projects/puppet' /> + <doc_link name='puppetlabs.com' + uri='http://www.puppetlabs.com/projects/puppet' /> </documentation> </template> </service> diff --git a/conf/suse/puppet.spec b/conf/suse/puppet.spec index 15a9b9e..9b2f7a3 100644 --- a/conf/suse/puppet.spec +++ b/conf/suse/puppet.spec @@ -10,8 +10,8 @@ Release: 1%{?dist} License: GPL Group: System Environment/Base -URL: http://reductivelabs.com/projects/puppet/ -Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tar.gz +URL: http://puppetlabs.com/projects/puppet/ +Source: http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz Patch0: puppet.suse.patch Requires: ruby >= 1.8.2 Requires: facter >= 1.3.7 diff --git a/examples/modules/sample-module/README.txt b/examples/modules/sample-module/README.txt index ee4b820..579fe60 100644 --- a/examples/modules/sample-module/README.txt +++ b/examples/modules/sample-module/README.txt @@ -12,6 +12,6 @@ templates/sample.erb Note the consistent naming of files for Puppet::Util::Autoload Reference Documents: -http://reductivelabs.com/trac/puppet/wiki/ModuleOrganisation -http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions -http://reductivelabs.com/trac/puppet/wiki/FunctionReference +http://puppetlabs.com/trac/puppet/wiki/ModuleOrganisation +http://puppetlabs.com/trac/puppet/wiki/WritingYourOwnFunctions +http://puppetlabs.com/trac/puppet/wiki/FunctionReference diff --git a/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb b/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb index d7ad7d2..e507462 100644 --- a/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb +++ b/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb @@ -27,7 +27,7 @@ # Jeff McCune <[email protected]> # 2007-08-14 -# See: http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions +# See: http://puppetlabs.com/trac/puppet/wiki/WritingYourOwnFunctions module Puppet::Parser::Functions newfunction(:hostname_to_dn, :type => :rvalue, :doc => "Given 'foo.bar.com', return 'dc=foo,dc=bar,dc=com'.") do |args| diff --git a/ext/extlookup.rb b/ext/extlookup.rb index b0978ef..4793cba 100644 --- a/ext/extlookup.rb +++ b/ext/extlookup.rb @@ -74,7 +74,7 @@ # need to edit a load of manifests to do simple things like adjust a desired version number. # # For more information on installing and writing your own custom functions see: -# http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions +# http://puppetlabs.com/trac/puppet/wiki/WritingYourOwnFunctions # # For further help contact Volcane on #puppet require 'csv' diff --git a/ext/nagios/naggen b/ext/nagios/naggen index 6ff09e2..be4a090 100755 --- a/ext/nagios/naggen +++ b/ext/nagios/naggen @@ -29,7 +29,7 @@ # just like any other executable. # # See the configuration file documentation at -# http://reductivelabs.com/projects/puppet/reference/configref.html for +# http://puppetlabs.com/projects/puppet/reference/configref.html for # the full list of acceptable parameters. A commented list of all # configuration options can also be generated by running puppet with # '--genconfig'. diff --git a/ext/puppet-test b/ext/puppet-test index dbbde40..2b48b82 100755 --- a/ext/puppet-test +++ b/ext/puppet-test @@ -23,7 +23,7 @@ # parameter, so you can specify '--server <servername>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/projects/puppet/reference/configref.html for +# http://puppetlabs.com/projects/puppet/reference/configref.html for # the full list of acceptable parameters. A commented list of all # configuration $options can also be generated by running puppetd with # '--genconfig'. diff --git a/ext/puppetstoredconfigclean.rb b/ext/puppetstoredconfigclean.rb index 439d743..6538192 100644 --- a/ext/puppetstoredconfigclean.rb +++ b/ext/puppetstoredconfigclean.rb @@ -3,7 +3,7 @@ # Script to clean up stored configs for (a) given host(s) # # Credits: -# Script was taken from http://reductivelabs.com/trac/puppet/attachment/wiki/UsingStoredConfiguration/kill_node_in_storedconfigs_db.rb +# Script was taken from http://puppetlabs.com/trac/puppet/attachment/wiki/UsingStoredConfiguration/kill_node_in_storedconfigs_db.rb # which haven been initially posted by James Turnbull # duritong adapted and improved the script a bit. diff --git a/ext/regexp_nodes/regexp_nodes.rb b/ext/regexp_nodes/regexp_nodes.rb index a9e7ed6..78e4357 100644 --- a/ext/regexp_nodes/regexp_nodes.rb +++ b/ext/regexp_nodes/regexp_nodes.rb @@ -2,7 +2,7 @@ # = Synopsis # This is an external node classifier script, after -# http://reductivelabs.com/trac/puppet/wiki/ExternalNodes +# http://puppetlabs.com/trac/puppet/wiki/ExternalNodes # # = Usage # regexp_nodes.rb <host> diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index e78b20f..d333535 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 a7029a0..d5ba3ef 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 d1e2b22..bc2dfb1 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 51fb7a2..1f9dc5a 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 d425d80..884e34f 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/util/nagios_maker.rb b/lib/puppet/util/nagios_maker.rb index 339d2d1..d7044f2 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 diff --git a/man/man5/puppet.conf.5 b/man/man5/puppet.conf.5 index 6bff15a..ff9b889 100644 --- a/man/man5/puppet.conf.5 +++ b/man/man5/puppet.conf.5 @@ -738,7 +738,7 @@ The LDAP attributes to use to define Puppet classes. Values should be comma\-se .UNINDENT .SS ldapnodes .sp -Whether to search for node configurations in LDAP. See \fI\%http://reductivelabs.com/trac/puppet/wiki/LDAPNodes\fP for more information. +Whether to search for node configurations in LDAP. See \fI\%http://puppetlabs.com/trac/puppet/wiki/LDAPNodes\fP for more information. .INDENT 0.0 .IP \(bu 2 . @@ -1310,7 +1310,7 @@ The maximum time to delay before runs. Defaults to being the same as the run in .UNINDENT .SS ssl_client_header .sp -The header containing an authenticated client\(aqs SSL DN. Only used with Mongrel. This header must be set by the proxy to the authenticated client\(aqs SSL DN (e.g., \fB/CN=puppet.reductivelabs.com\fP). See \fI\%http://reductivelabs.com/puppet/trac/wiki/UsingMongrel\fP for more information. +The header containing an authenticated client\(aqs SSL DN. Only used with Mongrel. This header must be set by the proxy to the authenticated client\(aqs SSL DN (e.g., \fB/CN=puppet.puppetlabs.com\fP). See \fI\%http://puppetlabs.com/puppet/trac/wiki/UsingMongrel\fP for more information. .INDENT 0.0 .IP \(bu 2 . @@ -1318,7 +1318,7 @@ The header containing an authenticated client\(aqs SSL DN. Only used with Mongr .UNINDENT .SS ssl_client_verify_header .sp -The header containing the status message of the client verification. Only used with Mongrel. This header must be set by the proxy to \(aqSUCCESS\(aq if the client successfully authenticated, and anything else otherwise. See \fI\%http://reductivelabs.com/puppet/trac/wiki/UsingMongrel\fP for more information. +The header containing the status message of the client verification. Only used with Mongrel. This header must be set by the proxy to \(aqSUCCESS\(aq if the client successfully authenticated, and anything else otherwise. See \fI\%http://puppetlabs.com/puppet/trac/wiki/UsingMongrel\fP for more information. .INDENT 0.0 .IP \(bu 2 . diff --git a/man/man8/filebucket.8 b/man/man8/filebucket.8 index de2dee7..a9f802e 100644 --- a/man/man8/filebucket.8 +++ b/man/man8/filebucket.8 @@ -64,7 +64,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an argument. .sp See the configuration file documentation at -\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the +\fI\%http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference\fP for the full list of acceptable parameters. A commented list of all configuration options can also be generated by running puppet with \(aq\-\-genconfig\(aq. diff --git a/man/man8/puppet.8 b/man/man8/puppet.8 index 02176ce..422d713 100644 --- a/man/man8/puppet.8 +++ b/man/man8/puppet.8 @@ -30,7 +30,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an argument. .sp See the configuration file documentation at -\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the +\fI\%http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference\fP for the full list of acceptable parameters. A commented list of all configuration options can also be generated by running puppet with \(aq\-\-genconfig\(aq. diff --git a/man/man8/puppetca.8 b/man/man8/puppetca.8 index 92e9de1..f72dcd4 100644 --- a/man/man8/puppetca.8 +++ b/man/man8/puppetca.8 @@ -33,7 +33,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an argument. .sp See the configuration file documentation at -\fI\%http://reductivelabs.com/projects/puppet/reference/configref.html\fP for +\fI\%http://puppetlabs.com/projects/puppet/reference/configref.html\fP for the full list of acceptable parameters. A commented list of all configuration options can also be generated by running puppetca with \(aq\-\-genconfig\(aq. diff --git a/man/man8/puppetd.8 b/man/man8/puppetd.8 index c2d5cb5..b0beca2 100644 --- a/man/man8/puppetd.8 +++ b/man/man8/puppetd.8 @@ -66,7 +66,7 @@ configuration parameter, so you can specify \(aq\-\-server <servername>\(aq as an argument. .sp See the configuration file documentation at -\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the +\fI\%http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference\fP for the full list of acceptable parameters. A commented list of all configuration options can also be generated by running puppetd with \(aq\-\-genconfig\(aq. diff --git a/man/man8/puppetmasterd.8 b/man/man8/puppetmasterd.8 index 5bfea2e..38323ee 100644 --- a/man/man8/puppetmasterd.8 +++ b/man/man8/puppetmasterd.8 @@ -29,7 +29,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an argument. .sp See the configuration file documentation at -\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the +\fI\%http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference\fP for the full list of acceptable parameters. A commented list of all configuration options can also be generated by running puppetmasterdd with \(aq\-\-genconfig\(aq. diff --git a/man/man8/puppetqd.8 b/man/man8/puppetqd.8 index bf08f2b..5a5b6fa 100644 --- a/man/man8/puppetqd.8 +++ b/man/man8/puppetqd.8 @@ -24,7 +24,7 @@ configuration parameter, so you can specify \(aq\-\-server <servername>\(aq as an argument. .sp See the configuration file documentation at -\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the +\fI\%http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference\fP for the full list of acceptable parameters. A commented list of all configuration options can also be generated by running puppetd with \(aq\-\-genconfig\(aq. diff --git a/man/man8/puppetrun.8 b/man/man8/puppetrun.8 index 73a4ba3..a3e5fa3 100644 --- a/man/man8/puppetrun.8 +++ b/man/man8/puppetrun.8 @@ -74,7 +74,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an argument. .sp See the configuration file documentation at -\fI\%http://reductivelabs.com/projects/puppet/reference/configref.html\fP for +\fI\%http://puppetlabs.com/projects/puppet/reference/configref.html\fP for the full list of acceptable parameters. A commented list of all configuration options can also be generated by running puppetmasterdd with \(aq\-\-genconfig\(aq. diff --git a/man/man8/ralsh.8 b/man/man8/ralsh.8 index 98892e0..dbb5686 100644 --- a/man/man8/ralsh.8 +++ b/man/man8/ralsh.8 @@ -42,7 +42,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an argument. .sp See the configuration file documentation at -\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the +\fI\%http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference\fP for the full list of acceptable parameters. A commented list of all configuration options can also be generated by running puppet with \(aq\-\-genconfig\(aq. diff --git a/sbin/puppetca b/sbin/puppetca index 27ba916..6b65184 100755 --- a/sbin/puppetca +++ b/sbin/puppetca @@ -26,7 +26,7 @@ # parameter, so you can specify '--ssldir <directory>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/projects/puppet/reference/configref.html for +# http://puppetlabs.com/projects/puppet/reference/configref.html for # the full list of acceptable parameters. A commented list of all # configuration options can also be generated by running puppetca with # '--genconfig'. diff --git a/sbin/puppetd b/sbin/puppetd index 873d328..b441a15 100755 --- a/sbin/puppetd +++ b/sbin/puppetd @@ -57,7 +57,7 @@ # parameter, so you can specify '--server <servername>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for +# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for # the full list of acceptable parameters. A commented list of all # configuration options can also be generated by running puppetd with # '--genconfig'. diff --git a/sbin/puppetmasterd b/sbin/puppetmasterd index 9f12f67..28223cd 100755 --- a/sbin/puppetmasterd +++ b/sbin/puppetmasterd @@ -21,7 +21,7 @@ # parameter, so you can specify '--ssldir <directory>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for +# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for # the full list of acceptable parameters. A commented list of all # configuration options can also be generated by running puppetmasterdd with # '--genconfig'. diff --git a/sbin/puppetqd b/sbin/puppetqd index 5487a32..bea24be 100755 --- a/sbin/puppetqd +++ b/sbin/puppetqd @@ -19,7 +19,7 @@ # parameter, so you can specify '--server <servername>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for +# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for # the full list of acceptable parameters. A commented list of all # configuration options can also be generated by running puppetd with # '--genconfig'. diff --git a/sbin/puppetrun b/sbin/puppetrun index d3b2630..c3942fc 100755 --- a/sbin/puppetrun +++ b/sbin/puppetrun @@ -63,7 +63,7 @@ # parameter, so you can specify '--ssldir <directory>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/projects/puppet/reference/configref.html for +# http://puppetlabs.com/projects/puppet/reference/configref.html for # the full list of acceptable parameters. A commented list of all # configuration options can also be generated by running puppetmasterdd with # '--genconfig'. diff --git a/spec/unit/application/filebucket.rb b/spec/unit/application/filebucket.rb index e87bab4..c0a6dcc 100644 --- a/spec/unit/application/filebucket.rb +++ b/spec/unit/application/filebucket.rb @@ -124,9 +124,9 @@ describe "Filebucket" do describe "with remote bucket" do it "should create a remote Client to the configured server" do - Puppet.stubs(:[]).with(:server).returns("puppet.reductivelabs.com") + Puppet.stubs(:[]).with(:server).returns("puppet.puppetlabs.com") - Puppet::Network::Client::Dipper.expects(:new).with { |h| h[:Server] == "puppet.reductivelabs.com" } + Puppet::Network::Client::Dipper.expects(:new).with { |h| h[:Server] == "puppet.puppetlabs.com" } @filebucket.run_setup end diff --git a/spec/unit/application/puppetd.rb b/spec/unit/application/puppetd.rb index 0f7257e..88772b2 100755 --- a/spec/unit/application/puppetd.rb +++ b/spec/unit/application/puppetd.rb @@ -275,10 +275,10 @@ describe "puppetd" do it "should set a central log destination with --centrallogs" do @puppetd.options.stubs(:[]).with(:centrallogs).returns(true) - Puppet.stubs(:[]).with(:server).returns("puppet.reductivelabs.com") + Puppet.stubs(:[]).with(:server).returns("puppet.puppetlabs.com") Puppet::Util::Log.stubs(:newdestination).with(:syslog) - Puppet::Util::Log.expects(:newdestination).with("puppet.reductivelabs.com") + Puppet::Util::Log.expects(:newdestination).with("puppet.puppetlabs.com") @puppetd.run_setup end diff --git a/spec/unit/parser/ast/leaf.rb b/spec/unit/parser/ast/leaf.rb index 62ebc2a..5e7516b 100755 --- a/spec/unit/parser/ast/leaf.rb +++ b/spec/unit/parser/ast/leaf.rb @@ -233,8 +233,8 @@ describe Puppet::Parser::AST::HostName do end it "should return a string usable as a tag when calling to_classname" do - host = Puppet::Parser::AST::HostName.new( :value => Puppet::Parser::AST::Regex.new(:value => "/.+.reductivelabs\.com/") ) - host.to_classname.should == "reductivelabs.com" + host = Puppet::Parser::AST::HostName.new( :value => Puppet::Parser::AST::Regex.new(:value => "/.+.puppetlabs\.com/") ) + host.to_classname.should == "puppetlabs.com" end it "should delegate 'match' to the underlying value if it is an HostName" do diff --git a/spec/unit/provider/ssh_authorized_key/parsed.rb b/spec/unit/provider/ssh_authorized_key/parsed.rb index 9abcda5..d5c66d7 100755 --- a/spec/unit/provider/ssh_authorized_key/parsed.rb +++ b/spec/unit/provider/ssh_authorized_key/parsed.rb @@ -73,7 +73,7 @@ describe provider_class do end it "'s parse_options method should be able to parse options containing commas" do - options = %w{from="host1.reductlivelabs.com,host.reductivelabs.com" command="/usr/local/bin/run" ssh-pty} + options = %w{from="host1.reductlivelabs.com,host.puppetlabs.com" command="/usr/local/bin/run" ssh-pty} optionstr = options.join(", ") @provider.parse_options(optionstr).should == options diff --git a/tasks/rake/gem.rake b/tasks/rake/gem.rake index ba9d8ab..e8b7feb 100644 --- a/tasks/rake/gem.rake +++ b/tasks/rake/gem.rake @@ -31,8 +31,8 @@ spec = Gem::Specification.new do |spec| spec.summary = 'Puppet, an automated configuration management tool' spec.description = 'Puppet, an automated configuration management tool' spec.author = 'Reductive Labs' - spec.email = '[email protected]' - spec.homepage = 'http://reductivelabs.com' + spec.email = '[email protected]' + spec.homepage = 'http://puppetlabs.com' spec.rubyforge_project = 'puppet' spec.has_rdoc = true spec.rdoc_options << diff --git a/tasks/rake/git_workflow.rake b/tasks/rake/git_workflow.rake index b2f96c6..eb3a665 100644 --- a/tasks/rake/git_workflow.rake +++ b/tasks/rake/git_workflow.rake @@ -1,5 +1,5 @@ # This set of tasks helps automate the workflow as described on -# http://reductivelabs.com/trac/puppet/wiki/Development/DevelopmentLifecycle +# http://puppetlabs.com/trac/puppet/wiki/Development/DevelopmentLifecycle def find_start(start) @@ -18,7 +18,7 @@ task :git_setup do @next_release = '0.26.x' @remote = {} default_remote = {} - default_remote[:url] = 'git://github.com/reductivelabs/puppet' + default_remote[:url] = 'git://github.com/puppetlabs/puppet' default_remote[:name] = 'origin' @remote[:name] = %x{git config puppet.defaultremote}.chomp @remote[:name] = @remote[:name].empty? ? default_remote[:name] : @remote[:name] diff --git a/test/data/providers/ssh_authorized_key/parsed/authorized_keys b/test/data/providers/ssh_authorized_key/parsed/authorized_keys index b22329d..e99e079 100644 --- a/test/data/providers/ssh_authorized_key/parsed/authorized_keys +++ b/test/data/providers/ssh_authorized_key/parsed/authorized_keys @@ -1,7 +1,7 @@ ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= [email protected] ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= Francois Deppierraz <[email protected]> from="192.168.1.1",command="/bin/false",no-pty,no-port-forwarding ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= Francois Deppierraz -from="192.168.1.1, www.reductivelabs.com",command="/bin/false",no-pty,no-port-forwarding ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= Francois Deppierraz +from="192.168.1.1, www.puppetlabs.com",command="/bin/false",no-pty,no-port-forwarding ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= Francois Deppierraz ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2Vi+TdC3iOGYcIo5vGTvC9P9rjHl9RxCuZmSfn+YDFQ35RXf0waijtjp9I7GYh6R4hBjA5z0u/Pzi95LET5NfRM0Gdc0DJyvBI7K+ALBxIT383Iz6Yz4iKxe1TEJgHGM2he4+7BHkjc3kdIZqIpZjucCk4VsXSxujO4MKKvtaKK2l+kahlLQHHw/vZkDpIgL52iGVsjW9l8RLJaKHZ4mDHJN/Q/Rzn2W4EvcdHUzwhvGMwZlm8clDwITBrSsawYtnivJrQSYcmTRqJuS8wprNDrLIhTGjrwFg5WpruUuMt6fLuCqwe6TeEL+nh3DQ4g554c5aRp3oU6LGBKTvNZGWQ== franc...@korn ssh-dss AAAAB3NzaC1kc3MAAACBAMPpCYnjywOemd8LqbbmC+bePNR3/H1rXsiFwjSLhYE3bbOpvclvOzN1DruFc34m0FopVnMkP+aubjdIYF8pijl+5hg9ggB7Kno2dl0Dd1rGN/swvmhA8OpLAQv7Qt7UnXKVho3as08zYZsrHxYFu0wlnkdbsv4cy4aXyQKd4MPVAAAAFQDSyQFWg8Qt3wU05buhZ10psoR7tQAAAIEAmAhguXwUnI3P2FF5NAW/mpJUmUERdL4pyZARUyAgpf7ezwrh9TJqrvGTQNBF97Xqaivyncm5JWQdMIsTBxEFaXZGkmBta02KnWcn447qvIh7iv8XpNL6M9flCkBEZOJ4t9El0ytTSHHaiCz8A20Et+E8evWyi1kXkFDt8ML2dGgAAACBAK0X4ympbdEjgV/ZyOc+BU22u7vOnfSOUJmyar4Ax1MIDNnoyNWKnGvxRutydQcQOKQHZEU0fE8MhPFn6nLF6CoVfEl/oz0EYz3hjV4WPFpHrF5DY/rhvNj8iuneKJ5P0dy/rG6m5qey25PnHyGFVoIRlkHJvBCJT40dHs40YEjI franc...@korn ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAut8aOSxenjOqF527dlsdHWV4MNoAsX14l9M297+SQXaQ5Z3BedIxZaoQthkDALlV/25A1COELrg9J2MqJNQc8Xe9XQOIkBQWWinUlD/BXwoOTWEy8C8zSZPHZ3getMMNhGTBO+q/O+qiJx3y5cA4MTbw2zSxukfWC87qWwcZ64UUlegIM056vPsdZWFclS9hsROVEa57YUMrehQ1EGxT4Z5j6zIopufGFiAPjZigq/vqgcAqhAKP6yu4/gwO6S9tatBeEjZ8fafvj1pmvvIplZeMr96gHE7xS3pEEQqnB3nd4RY7AF6j9kFixnsytAUO7STPh/M3pLiVQBN89TvWPQ== diff --git a/test/network/handler/ca.rb b/test/network/handler/ca.rb index 16782bb..f528c7b 100755 --- a/test/network/handler/ca.rb +++ b/test/network/handler/ca.rb @@ -69,7 +69,7 @@ class TestCA < Test::Unit::TestCase newtext = nil assert_nothing_raised { newtext, cacerttext = ca.getcert( - cert.csr.to_s, "test.reductivelabs.com", "127.0.0.1" + cert.csr.to_s, "test.puppetlabs.com", "127.0.0.1" ) } @@ -110,7 +110,7 @@ class TestCA < Test::Unit::TestCase certtext = nil assert_nothing_raised { certtext, cacerttext = caserv.getcert( - cert.csr.to_s, "test.reductivelabs.com", "127.0.0.1" + cert.csr.to_s, "test.puppetlabs.com", "127.0.0.1" ) } @@ -167,7 +167,7 @@ class TestCA < Test::Unit::TestCase # make sure we know what's going on assert(caserv.autosign?("hostmatch.domain.com")) assert(caserv.autosign?("fakehost.other.com")) - assert(!caserv.autosign?("kirby.reductivelabs.com")) + assert(!caserv.autosign?("kirby.puppetlabs.com")) assert(!caserv.autosign?("culain.domain.com")) end @@ -181,7 +181,7 @@ class TestCA < Test::Unit::TestCase # make sure we know what's going on assert(!caserv.autosign?("hostmatch.domain.com")) assert(!caserv.autosign?("fakehost.other.com")) - assert(!caserv.autosign?("kirby.reductivelabs.com")) + assert(!caserv.autosign?("kirby.puppetlabs.com")) assert(!caserv.autosign?("culain.domain.com")) end -- 1.6.6.1 -- 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.
