cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 2.6.3 and make it possible to tell the server from the client

Browse Source 
which default node to use in case LDAP is used by setting the FACTER_defnode
environment variable.
This commit is contained in:
robert 2010-11-17 13:07:17 +00:00
parent 676b798dee
commit f5b4fa5e19
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysutils/ruby-puppet/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.25 2010/11/13 11:18:41 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.26 2010/11/17 13:07:17 robert Exp $
COMMENT= centralised configuration management for networks
VERSION= 2.6.3rc2
VERSION= 2.6.3
DISTNAME= puppet-${VERSION}
PKGNAME= ruby-${DISTNAME}
REVISION= 2
CATEGORIES= sysutils net
HOMEPAGE= http://reductivelabs.com/projects/puppet/

10
sysutils/ruby-puppet/distinfo
View File

@ -1,5 +1,5 @@
MD5 (puppet-2.6.3rc2.tar.gz) = jxJPNXYpdcCwSLvPlhFbHg==
RMD160 (puppet-2.6.3rc2.tar.gz) = LOr8gzmr4ZGmWjYw4e/VjNDzL7A=
SHA1 (puppet-2.6.3rc2.tar.gz) = NjB5cdfL5rDOTYxXeTf6L05kc+o=
SHA256 (puppet-2.6.3rc2.tar.gz) = pt021npCjEwztR2r+NTR42M33Q4Kpsjk3aSaeEgz2p8=
SIZE (puppet-2.6.3rc2.tar.gz) = 1499485
MD5 (puppet-2.6.3.tar.gz) = UYPJ1dMW08GGft4GfqP+jA==
RMD160 (puppet-2.6.3.tar.gz) = VM8dwOae2VcisleLcRnWF7+mMWw=
SHA1 (puppet-2.6.3.tar.gz) = dSXiejlqEKsvD/KGpFch43xcCcQ=
SHA256 (puppet-2.6.3.tar.gz) = Fg7r2o5gssjcdIP/wVR0PVIsYTCS/mT146V8IzWYPXc=
SIZE (puppet-2.6.3.tar.gz) = 1500924

23
sysutils/ruby-puppet/patches/patch-lib_puppet_indirector_node_ldap_rb
View File

@ -1,7 +1,22 @@
$OpenBSD: patch-lib_puppet_indirector_node_ldap_rb,v 1.1 2010/11/04 07:20:57 robert Exp $
--- lib/puppet/indirector/node/ldap.rb.orig Fri Oct 29 00:15:08 2010
+++ lib/puppet/indirector/node/ldap.rb Fri Oct 29 00:15:57 2010
@@ -174,6 +174,14 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
$OpenBSD: patch-lib_puppet_indirector_node_ldap_rb,v 1.2 2010/11/17 13:07:17 robert Exp $
--- lib/puppet/indirector/node/ldap.rb.orig Thu Sep 23 01:17:21 2010
+++ lib/puppet/indirector/node/ldap.rb Fri Nov 12 11:15:22 2010
@@ -1,3 +1,4 @@
+require 'facter'
require 'puppet/node'
require 'puppet/indirector/ldap'
@@ -29,6 +30,9 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
def find(request)
names = [request.key]
names << request.key.sub(/\..+/, '') if request.key.include?(".") # we assume it's an fqdn
+
+ defnode = Puppet::Node::Facts.find(request.key).values['defnode']
+ names << defnode if defnode
names << "default"
node = nil
@@ -174,6 +178,14 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
parent_info = name2hash(parent) || raise(Puppet::Error.new("Could not find parent node '#{parent}'"))
information[:classes] += parent_info[:classes]
parent_info[:parameters].each do |param, value|