Best unofficial Apache Server developers community |
PATCH 00/10]: More fixes to the core drivers
| |||||
| Aug 5, 2010 | |||||
 Chris Lalancette |
|
||||
| Tags: | |||||
Similar Threads
PATCH/puppet 1/1] Fixes errant Trac references in documentation
Signed-off-by: James Turnbull <jam### @lovedthanlost.net> --- examples/modules/sample-module/README.txt | 2 +- .../lib/puppet/parser/functions/hostname_to_dn.rb | 2 +- ext/extlookup.rb | 2 +- ext/regexp_nodes/regexp_nodes.rb | 2 +- lib/puppet/parser/functions/inline_template.rb | 2 +- lib/puppet/provider/package/pkgdmg.rb | 2 +- lib/puppet/reference/providers.rb | 2 +- lib/puppet/util/command_line/filebucket | 2 +- lib/puppet/util/command_line/puppet | 2 +- lib/puppet/util/command_line/puppetd | 2 +- lib/puppet/util/command_line/puppetmasterd | 2 +- lib/puppet/util/command_line/puppetqd | 2 +- lib/puppet/util/command_line/ralsh | 2 +- man/man8/filebucket.8 | 2 +- man/man8/puppet.8 | 2 +- man/man8/puppetd.8 | 2 +- man/man8/puppetmasterd.8 | 2 +- man/man8/puppetqd.8 | 2 +- man/man8/ralsh.8 | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/examples/modules/sample-module/README.txt b/examples/modules/sample-module/README.txt index ee4b820..bdced62 100644 --- a/examples/modules/sample-module/README.txt +++ b/examples/modules/sample-module/README.txt @@ -13,5 +13,5 @@ Note the consistent naming of files for Puppet::Util::Autoload Reference Documents: http://reductivelabs.com/trac/puppet/wiki/ModuleOrganisation -http://reductivelabs.com/trac/puppet/...gYourOwnFunctions +http://docs/puppetlabs.com/guides/custom_functions.html http://reductivelabs.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 34ab280..8c6fb3c 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 <jeff.### @northstarlabs.net> # 2007-08-14 -# See: http://reductivelabs.com/trac/puppet/...gYourOwnFunctions +# See: http://docs/puppetlabs.com/guides/custom_functions.html 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 b72fc12..b732812 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/...gYourOwnFunctions +# http://docs/puppetlabs.com/guides/custom_functions.html # # For further help contact Volcane on #puppet require 'csv' diff --git a/ext/regexp_nodes/regexp_nodes.rb b/ext/regexp_nodes/regexp_nodes.rb index e234985..e5a787e 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://docs/puppetlabs.com/guides/external_nodes.html # # = Usage # regexp_nodes.rb <host> diff --git a/lib/puppet/parser/functions/inline_template.rb b/lib/puppet/parser/functions/inline_template.rb index 11d980f..3aac51e 100644 --- a/lib/puppet/parser/functions/inline_template.rb +++ b/lib/puppet/parser/functions/inline_template.rb @@ -1,6 +1,6 @@ Puppet::Parser::Functions::newfunction(:inline_template, :type => :rvalue, :doc => "Evaluate a template string and return its value. See `the templating docs - </trac/puppet/wiki/PuppetTemplating>`_ for more information. Note that + <http://docs/puppetlabs.com/guides/templating.html>`_ for more information. Note that if multiple template strings are specified, their output is all concatenated and returned as the output of the function.") do |vals| require 'erb' diff --git a/lib/puppet/provider/package/pkgdmg.rb b/lib/puppet/provider/package/pkgdmg.rb index 4506fbf..39e377d 100644 --- a/lib/puppet/provider/package/pkgdmg.rb +++ b/lib/puppet/provider/package/pkgdmg.rb @@ -29,7 +29,7 @@ require 'puppet/provider/package' require 'facter/util/plist' Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Package do - desc "Package management based on Apple's Installer.app and DiskUtility.app. This package works by checking the contents of a DMG image for Apple pkg or mpkg files. Any number of pkg or mpkg files may exist in the root directory of the DMG file system. Sub directories are not checked for packages. See `the wiki docs </trac/puppet/wiki/DmgPackages>` for more detail." + desc "Package management based on Apple's Installer.app and DiskUtility.app. This package works by checking the contents of a DMG image for Apple pkg or mpkg files. Any number of pkg or mpkg files may exist in the root directory of the DMG file system. Sub directories are not checked for packages. See `the wiki docs <http://projects.puppetlabs.com/projec...Dmg_Patterns>` for more detail." confine :operatingsystem => :darwin defaultfor :operatingsystem => :darwin diff --git a/lib/puppet/reference/providers.rb b/lib/puppet/reference/providers.rb index a0f1063..bac536b 100644 --- a/lib/puppet/reference/providers.rb +++ b/lib/puppet/reference/providers.rb @@ -95,7 +95,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider ret += h(type.name.to_s + "_", 2) - ret += ".. _#{type.name}: #{"http://reductivelabs.com/trac/puppet/...ence##{type.name}"}\n\n" + ret += ".. _#{type.name}: #{"http://docs/puppetlabs.com/references...html##{type.name}"}\n\n" ret += option("Default provider", default) ret += doctable(headers, table_data) diff --git a/lib/puppet/util/command_line/filebucket b/lib/puppet/util/command_line/filebucket index ba9d8cd..f262818 100755 --- a/lib/puppet/util/command_line/filebucket +++ b/lib/puppet/util/command_line/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/...gurationReference for +# http://docs/puppetlabs.com/references...onfiguration.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/lib/puppet/util/command_line/puppet b/lib/puppet/util/command_line/puppet index f65ef90..4952108 100755 --- a/lib/puppet/util/command_line/puppet +++ b/lib/puppet/util/command_line/puppet @@ -22,7 +22,7 @@ # parameter, so you can specify '--ssldir <directory>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/trac/puppet/...gurationReference for +# http://docs/puppetlabs.com/references...onfiguration.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/lib/puppet/util/command_line/puppetd b/lib/puppet/util/command_line/puppetd index 3af2fda..e394734 100755 --- a/lib/puppet/util/command_line/puppetd +++ b/lib/puppet/util/command_line/puppetd @@ -69,7 +69,7 @@ # parameter, so you can specify '--server <servername>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/trac/puppet/...gurationReference for +# http://docs/puppetlabs.com/references...onfiguration.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'. diff --git a/lib/puppet/util/command_line/puppetmasterd b/lib/puppet/util/command_line/puppetmasterd index c58612c..4d94fef 100755 --- a/lib/puppet/util/command_line/puppetmasterd +++ b/lib/puppet/util/command_line/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/...gurationReference for +# http://docs/puppetlabs.com/references...onfiguration.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/lib/puppet/util/command_line/puppetqd b/lib/puppet/util/command_line/puppetqd index 439db5c..78a940a 100755 --- a/lib/puppet/util/command_line/puppetqd +++ b/lib/puppet/util/command_line/puppetqd @@ -20,7 +20,7 @@ # parameter, so you can specify '--server <servername>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/trac/puppet/...gurationReference for +# http://docs/puppetlabs.com/references...onfiguration.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/lib/puppet/util/command_line/ralsh b/lib/puppet/util/command_line/ralsh index b866ede..a89a1eb 100755 --- a/lib/puppet/util/command_line/ralsh +++ b/lib/puppet/util/command_line/ralsh @@ -34,7 +34,7 @@ # parameter, so you can specify '--ssldir <directory>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/trac/puppet/...gurationReference for +# http://docs/puppetlabs.com/references...onfiguration.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/man/man8/filebucket.8 b/man/man8/filebucket.8 index de2dee7..2cfc82c 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/...gurationReference\fP for the +\fI\%http://docs/puppetlabs.com/references...onfiguration.html\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..d34711b 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/...gurationReference\fP for the +\fI\%http://docs/puppetlabs.com/references...onfiguration.html\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/puppetd.8 b/man/man8/puppetd.8 index c2d5cb5..a913531 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/...gurationReference\fP for the +\fI\%http://docs/puppetlabs.com/references...onfiguration.html\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..680e505 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/...gurationReference\fP for the +\fI\%http://docs/puppetlabs.com/references...onfiguration.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/puppetqd.8 b/man/man8/puppetqd.8 index bf08f2b..2da8b98 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/...gurationReference\fP for the +\fI\%http://docs/puppetlabs.com/references...onfiguration.html\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/ralsh.8 b/man/man8/ralsh.8 index 98892e0..8380b88 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/...gurationReference\fP for the +\fI\%http://docs/puppetlabs.com/references...onfiguration.html\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.
PATCH/puppet 1/1] Fixes errant Trac references in documentation
Signed-off-by: James Turnbull <jam### @lovedthanlost.net> --- examples/modules/sample-module/README.txt | 2 +- .../lib/puppet/parser/functions/hostname_to_dn.rb | 2 +- ext/extlookup.rb | 2 +- ext/regexp_nodes/regexp_nodes.rb | 2 +- lib/puppet/parser/functions/inline_template.rb | 2 +- .../provider/nameservice/directoryservice.rb | 2 +- lib/puppet/provider/package/pkgdmg.rb | 2 +- lib/puppet/reference/providers.rb | 2 +- lib/puppet/util/command_line/filebucket | 2 +- lib/puppet/util/command_line/puppet | 2 +- lib/puppet/util/command_line/puppetd | 2 +- lib/puppet/util/command_line/puppetmasterd | 2 +- lib/puppet/util/command_line/puppetqd | 2 +- lib/puppet/util/command_line/ralsh | 2 +- man/man8/filebucket.8 | 2 +- man/man8/puppet.8 | 2 +- man/man8/puppetd.8 | 2 +- man/man8/puppetmasterd.8 | 2 +- man/man8/puppetqd.8 | 2 +- man/man8/ralsh.8 | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/examples/modules/sample-module/README.txt b/examples/modules/sample-module/README.txt index ee4b820..cd35c83 100644 --- a/examples/modules/sample-module/README.txt +++ b/examples/modules/sample-module/README.txt @@ -13,5 +13,5 @@ Note the consistent naming of files for Puppet::Util::Autoload Reference Documents: http://reductivelabs.com/trac/puppet/wiki/ModuleOrganisation -http://reductivelabs.com/trac/puppet/...gYourOwnFunctions +http://docs.puppetlabs.com/guides/custom_functions.html http://reductivelabs.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 34ab280..fe4e549 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 <jeff.m### @northstarlabs.net> # 2007-08-14 -# See: http://reductivelabs.com/trac/puppet/...gYourOwnFunctions +# See: http://docs.puppetlabs.com/guides/custom_functions.html 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 b72fc12..d87583b 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/...gYourOwnFunctions +# http://docs.puppetlabs.com/guides/custom_functions.html # # For further help contact Volcane on #puppet require 'csv' diff --git a/ext/regexp_nodes/regexp_nodes.rb b/ext/regexp_nodes/regexp_nodes.rb index e234985..8712155 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://docs.puppetlabs.com/guides/external_nodes.html # # = Usage # regexp_nodes.rb <host> diff --git a/lib/puppet/parser/functions/inline_template.rb b/lib/puppet/parser/functions/inline_template.rb index 11d980f..46e0003 100644 --- a/lib/puppet/parser/functions/inline_template.rb +++ b/lib/puppet/parser/functions/inline_template.rb @@ -1,6 +1,6 @@ Puppet::Parser::Functions::newfunction(:inline_template, :type => :rvalue, :doc => "Evaluate a template string and return its value. See `the templating docs - </trac/puppet/wiki/PuppetTemplating>`_ for more information. Note that + <http://docs.puppetlabs.com/guides/templating.html>`_ for more information. Note that if multiple template strings are specified, their output is all concatenated and returned as the output of the function.") do |vals| require 'erb' diff --git a/lib/puppet/provider/nameservice/directoryservice.rb b/lib/puppet/provider/nameservice/directoryservice.rb index 76fc466..965a2aa 100644 --- a/lib/puppet/provider/nameservice/directoryservice.rb +++ b/lib/puppet/provider/nameservice/directoryservice.rb @@ -41,7 +41,7 @@ class DirectoryService < Puppet::Provider::NameService # JJM 2007-07-25: This map is used to map NameService attributes to their # corresponding DirectoryService attribute names. - # See: http://images.apple.com/server/docs/Open_Directory_v10.4.pdf + # See: http://images.apple.com/server/docs.Open_Directory_v10.4.pdf # JJM: Note, this is de-coupled from the Puppet::Type, and must # be actively maintained. There may also be collisions with different # types (Users, Groups, Mounts, Hosts, etc...) diff --git a/lib/puppet/provider/package/pkgdmg.rb b/lib/puppet/provider/package/pkgdmg.rb index 4506fbf..39e377d 100644 --- a/lib/puppet/provider/package/pkgdmg.rb +++ b/lib/puppet/provider/package/pkgdmg.rb @@ -29,7 +29,7 @@ require 'puppet/provider/package' require 'facter/util/plist' Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Package do - desc "Package management based on Apple's Installer.app and DiskUtility.app. This package works by checking the contents of a DMG image for Apple pkg or mpkg files. Any number of pkg or mpkg files may exist in the root directory of the DMG file system. Sub directories are not checked for packages. See `the wiki docs </trac/puppet/wiki/DmgPackages>` for more detail." + desc "Package management based on Apple's Installer.app and DiskUtility.app. This package works by checking the contents of a DMG image for Apple pkg or mpkg files. Any number of pkg or mpkg files may exist in the root directory of the DMG file system. Sub directories are not checked for packages. See `the wiki docs <http://projects.puppetlabs.com/projec...Dmg_Patterns>` for more detail." confine :operatingsystem => :darwin defaultfor :operatingsystem => :darwin diff --git a/lib/puppet/reference/providers.rb b/lib/puppet/reference/providers.rb index a0f1063..ef33a55 100644 --- a/lib/puppet/reference/providers.rb +++ b/lib/puppet/reference/providers.rb @@ -95,7 +95,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider ret += h(type.name.to_s + "_", 2) - ret += ".. _#{type.name}: #{"http://reductivelabs.com/trac/puppet/...ence##{type.name}"}\n\n" + ret += ".. _#{type.name}: #{"http://docs.puppetlabs.com/references...html##{type.name}"}\n\n" ret += option("Default provider", default) ret += doctable(headers, table_data) diff --git a/lib/puppet/util/command_line/filebucket b/lib/puppet/util/command_line/filebucket index ba9d8cd..8302d7b 100755 --- a/lib/puppet/util/command_line/filebucket +++ b/lib/puppet/util/command_line/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/...gurationReference for +# http://docs.puppetlabs.com/references...onfiguration.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/lib/puppet/util/command_line/puppet b/lib/puppet/util/command_line/puppet index f65ef90..7b6c0ae 100755 --- a/lib/puppet/util/command_line/puppet +++ b/lib/puppet/util/command_line/puppet @@ -22,7 +22,7 @@ # parameter, so you can specify '--ssldir <directory>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/trac/puppet/...gurationReference for +# http://docs.puppetlabs.com/references...onfiguration.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/lib/puppet/util/command_line/puppetd b/lib/puppet/util/command_line/puppetd index 3af2fda..571b154 100755 --- a/lib/puppet/util/command_line/puppetd +++ b/lib/puppet/util/command_line/puppetd @@ -69,7 +69,7 @@ # parameter, so you can specify '--server <servername>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/trac/puppet/...gurationReference for +# http://docs.puppetlabs.com/references...onfiguration.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'. diff --git a/lib/puppet/util/command_line/puppetmasterd b/lib/puppet/util/command_line/puppetmasterd index c58612c..74efb38 100755 --- a/lib/puppet/util/command_line/puppetmasterd +++ b/lib/puppet/util/command_line/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/...gurationReference for +# http://docs.puppetlabs.com/references...onfiguration.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/lib/puppet/util/command_line/puppetqd b/lib/puppet/util/command_line/puppetqd index 439db5c..48fc952 100755 --- a/lib/puppet/util/command_line/puppetqd +++ b/lib/puppet/util/command_line/puppetqd @@ -20,7 +20,7 @@ # parameter, so you can specify '--server <servername>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/trac/puppet/...gurationReference for +# http://docs.puppetlabs.com/references...onfiguration.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/lib/puppet/util/command_line/ralsh b/lib/puppet/util/command_line/ralsh index b866ede..68ad92d 100755 --- a/lib/puppet/util/command_line/ralsh +++ b/lib/puppet/util/command_line/ralsh @@ -34,7 +34,7 @@ # parameter, so you can specify '--ssldir <directory>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/trac/puppet/...gurationReference for +# http://docs.puppetlabs.com/references...onfiguration.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/man/man8/filebucket.8 b/man/man8/filebucket.8 index de2dee7..2cfc82c 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/...gurationReference\fP for the +\fI\%http://docs/puppetlabs.com/references...iguration.html\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..d34711b 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/...gurationReference\fP for the +\fI\%http://docs/puppetlabs.com/references...iguration.html\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/puppetd.8 b/man/man8/puppetd.8 index c2d5cb5..a913531 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/...gurationReference\fP for the +\fI\%http://docs/puppetlabs.com/references...iguration.html\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..680e505 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/...gurationReference\fP for the +\fI\%http://docs/puppetlabs.com/references...iguration.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/puppetqd.8 b/man/man8/puppetqd.8 index bf08f2b..2da8b98 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/...gurationReference\fP for the +\fI\%http://docs/puppetlabs.com/references...iguration.html\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/ralsh.8 b/man/man8/ralsh.8 index 98892e0..8380b88 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/...gurationReference\fP for the +\fI\%http://docs/puppetlabs.com/references...iguration.html\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.
PATCH/puppet 1/1] Fixes #4300 - Adjusted Solaris service files
Signed-off-by: James Turnbull <ja### @lovedthanlost.net> --- conf/solaris/smf/svc-puppetd | 2 +- conf/solaris/smf/svc-puppetmasterd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/solaris/smf/svc-puppetd b/conf/solaris/smf/svc-puppetd index 9036b50..b6cf057 100755 --- a/conf/solaris/smf/svc-puppetd +++ b/conf/solaris/smf/svc-puppetd @@ -12,7 +12,7 @@ exec_prefix=/opt/csw sysconfdir=/opt/csw/etc sbindir=/opt/csw/sbin -pidfile=/var/lib/puppet/run/puppetd.pid +pidfile=/var/lib/puppet/run/agent.pid case "$1" in start) diff --git a/conf/solaris/smf/svc-puppetmasterd b/conf/solaris/smf/svc-puppetmasterd index 34f5a62..80e3d46 100755 --- a/conf/solaris/smf/svc-puppetmasterd +++ b/conf/solaris/smf/svc-puppetmasterd @@ -8,7 +8,7 @@ exec_prefix=/opt/csw sysconfdir=/opt/csw/etc sbindir=/opt/csw/sbin -pidfile=/var/lib/puppet/run/puppetmasterd.pid +pidfile=/var/lib/puppet/run/master.pid case "$1" in start)
PATCH/puppet 1/1] [#4370] Fixes extlookup precedence getting overwritten between runs
We found the gsub! in extlookup was actually modifying the value for extlookup_precedence, so the next node to call it just got the interpolated value from the first run. We did two things in the code to prevent this: 1. We returned a dup of the ast string object so that modifying it wouldn’t change puppet’s state. We didn’t do this for all possible return values because we depend on using the original ast array object to do array concatenation 2. We fixed extlookup to not do a destructive gsub Reviewed by: Jesse Wolfe Signed-off-by: Matt Robinson <mat### @puppetlabs.com> --- lib/puppet/parser/ast/function.rb | 1 - lib/puppet/parser/ast/leaf.rb | 2 +- lib/puppet/parser/functions/extlookup.rb | 16 ++++++
Re: [PATCH core 1/4] Instance credentials managment (rev 2)
On Tue, 2010-08-03 at 14:26 +0200, mfoj### @redhat.com wrote: --- server/deltacloud.rb | 1 + server/lib/deltacloud/base_driver/base_driver.rb | 10 ++++ server/lib/deltacloud/base_driver/features.rb | 7 +++ server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 48 ++++++++++++++++++ .../lib/deltacloud/drivers/gogrid/gogrid_driver.rb | 25 +++++++++- .../lib/deltacloud/helpers/application_helper.rb | 6 ++ .../lib/deltacloud/models/instance_credential.rb | 27 ++++++++++ server/server.rb | 52 +++++++++++++++++++- server/views/instance_credentials/index.html.haml | 26 ++++++++++ server/views/instance_credentials/index.xml.haml | 4 ++ server/views/instance_credentials/new.html.haml | 8 +++ server/views/instance_credentials/show.html.haml | 22 ++++++++ server/views/instance_credentials/show.xml.haml | 22 ++++++++ 13 files changed, 256 insertions(+), 2 deletions(-) create mode 100644 server/lib/deltacloud/models/instance_credential.rb create mode 100644 server/views/instance_credentials/index.html.haml create mode 100644 server/views/instance_credentials/index.xml.haml create mode 100644 server/views/instance_credentials/new.html.haml create mode 100644 server/views/instance_credentials/show.html.haml create mode 100644 server/views/instance_credentials/show.xml.haml You still need to fix the indentation in show.xml.haml: diff --git a/server/views/instance_credentials/show.xml.haml b/server/views/instance_credentials/show.xml.haml new file mode 100644 index 0000000..fde3daa --- /dev/null +++ b/server/views/instance_credentials/show.xml.haml @@ -0,0 +1,22 @@ +- unless defined?(partial) + !!! XML +%instance_credential{ :href => instance_credential_url(@instance_credential.id), :id => @instance_credential.id } + %actions + - if @instance_credential.respond_to?(:destroy_instance_credential) + %link{ :rel => "destroy", :method => "delete", :href => destroy_instance_credential_url(@instance_credential.id)} The link line needs to be indented David
jira] Commented: (LIBCLOUD-40) Different drivers use different types for Node.id
[
https://issues.apache.org/jira/browse...2#action_12895772
]
Jed Smith commented on LIBCLOUD-40:
jira] Assigned: (LIBCLOUD-40) Different drivers use different types for Node.id
[
https://issues.apache.org/jira/browse...nels:all-tabpanel
]
Jed Smith reassigned LIBCLOUD-40:
jira] Assigned: (LIBCLOUD-40) Different drivers use different types for Node.id
[
https://issues.apache.org/jira/browse...nels:all-tabpanel
]
Jed Smith reassigned LIBCLOUD-40:
svn commit: r981362 - in /httpd/httpd/branches/2.2.x/docs/manual/mod: core.html.en core.xml.de core.
Author: wrowe Date: Mon Aug 2 04:01:43 2010 New Revision: 981362 URL: http://svn.apache.org/viewvc?rev=981362&view=rev Log: Seems this hadn't been rebuild in a bit Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.ja httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.meta httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.tr httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.html.en httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.xml.ja httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.xml.ko httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.xml.meta httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.xml.tr Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en URL: http://svn.apache.org/viewvc/httpd/ht...362&view=diff
OS/2 fixes for APR
Hi All, I'd like to get my OS2 specific fixes to support a newer compiler/runtime than the current EMX support. What is the best way to provide the patches? Source file by source file to make review easier, or is one larger patch OK? Should I open a ticket for this or post the patches to the group? Paul.
Re: cppcheck fixes
On Tue, Apr 6, 2010 at 7:59 AM, Stefan Fritsch <s### @sfritsch.de> wrote: Hi, I have tried the cppcheck static code analyzer on apr trunk and it found some errors that may be worth fixing. For some, I have attached a patch. At first blush, the attached patch looks reasonable. The changes to threadproc/beos/proc.c appear to fix broken C code. Time to poke the Beos maintainer? For dbd/apr_dbd_oracle.c, IMO the declaration should be kept in the outer scope block. i.e. apr_dbd_t *handle; if (trans) { handle = trans->handle; I'm not certain about the changes to file_io/unix/open.c, as I'm not sure whether APR_FOPEN_NOCLEANUP/APR_FILE_NOCLEANUP has some special meaning here. These two I think are false positives/intentional: [./dso/win32/dso.c:133]: (error) Uninitialized variable: rv [./misc/unix/otherchild.c:85]: (error) Possible null pointer dereference: cur Both look ok.
Commonssite JIRA fixes
I'm trying to resolve the outstanding Parent Pom JIRAs. Please let me know if you think I've resolved any incorrectly ...
Windows/JRuby 1.5.0 spec fixes
I've been able to get the number of failing specs down to 11. The ones that still fail fall into two categories: - FileUtils.touch is not updating the mtime of directories correctly. I've reported this as JRUBY-4837 with an included spec. - File permission checking does not work on Windows. This causes the 'manifest 644' and 'ziptask should preserve permission' specs to fail I'm not sure how the second category can be resolved. I had a look at Ant's zip and tar tasks to see how it's supported there. Those tasks extend FileSet by allowing explicit uid,gid and perm values to be specified. Similar options should probably be added to the ArchiveTask#include methods. That way the perms in the final archive and the perms on the fs could be decoupled. Any thoughts on this? Pepijn
a couple of trivial fixes to vim syntax file
Hello, I opened vim on a file containing all code examples James listed in the latest 2.6RC annoucement, and it appears that except the new "elsif" everything get's hilighted correctly. So as I was at it, I just made a couple of minor improvements. The patches are also found on http://github.com/mfournier/puppet/tree/vim26 Cheers, Marc
Fixes legacy issues with custom plugin/fact path
There are a couple of places where we haven't updated the defaults with the change from module/plugins/etc to modules/lib/etc. At some point we should deprecate the modules/plugins strucuture totally.
Move classes of module core-mock to src/test/java of core-api
Hi dev, the core-mock module includes some mock implementations of ApacheDS core-api classes (CoreSession, DirectoryService, etc.). It is only used as test dependency in ldif-partition. To get rid of the core-mock module I'd like to suggest to move those classes to src/test/java in core-api. To be able to use the test classes outside of the core-api module we just need to deploy the test jar of core-api. The using module then needs to specify a dependency with classifier "tests", see [1] for details. Thoughts? Kind Regards, Stefan [1] http://maven.apache.org/guides/mini/g...tached-tests.html
Modules core-constants and core-avl
Hi, two other small modules we have are core-constants and core-avl. I think we can move the 4 relevant files of core-contants to core-api and delete core-constants. For core-avl I'm not sure if we should merge it into another module or keep it as its own module. It is only used by the AVL store which is now part of xdbm-partition, so the AVL classes could be moved there. Another option is to move the AVL classes to core-api. WDYT? Kind Regards, Stefan
PATCH/puppet 1/3] conf/redhat: Rebase rundir-perms patch
--- conf/redhat/rundir-perms.patch | 26 +++++++++++++
PATCH/puppet 1/1] Fix for #4465 -- earlier "feature" patch broke ldap
The patch for #3904 should not have been accepted; it's buggy and the use case (supporting having nodes in ldap more than once with the same name but distinct records) is ill-conceived. This commit reverts the patch (a7884b47) and the previous attempt to fix it (e6709da4), restoring the old (0.25.x) behaviour. Signed-off-by: Markus Roberts <Mark### @reality.com> --- lib/puppet/indirector/node/ldap.rb | 60 ++++
a bug in activemq-core
hi
i had used activemq5.3.0 in a application, and it crashed a month ago
we found there is a bug in activemq's source code. when send message time
out ,response return null not exception, but code not handle.
it's terrible !!! please fix it as soon as possible~
at ActiveMQConection.java
private Response doSyncSendPacket(Command command, int timeout)
throws JMSException {
try {
Response response = (Response)this.transport.request(command,
timeout);
if (response != null && response.isException()) {
ExceptionResponse er = (ExceptionResponse)response;
if (er.getException() instanceof JMSException) {
throw (JMSException)er.getException();
} else {
throw JMSExceptionSupport.create(er.getException());
}
}
return response;
} catch (IOException e) {
throw JMSExceptionSupport.create(e);
}
}
| |||||
(17 lines) Aug 6, 2010 04:55