Update to 0.25.5 and replace the their new stupid /var/lib/puppet
default workdir with /var/puppet
This commit is contained in:
robert
parent
a04149a51e
commit
07e011aa34
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2010/05/07 15:53:34 robert Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2010/05/18 18:44:37 robert Exp $
|
||||
|
||||
COMMENT= centralised configuration management for networks
|
||||
|
||||
VERSION= 0.25.4
|
||||
VERSION= 0.25.5
|
||||
DISTNAME= puppet-${VERSION}
|
||||
PKGNAME= ruby-${DISTNAME}
|
||||
CATEGORIES= sysutils net
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (puppet-0.25.4.tar.gz) = aclwGf2lYg+fRfatZEB+Ow==
|
||||
RMD160 (puppet-0.25.4.tar.gz) = Z2EEFNblxB6VQet/OS85G5TxgC4=
|
||||
SHA1 (puppet-0.25.4.tar.gz) = KQ3MIOtnC1uOJtUDAUMOEzOgN6s=
|
||||
SHA256 (puppet-0.25.4.tar.gz) = wt1kCjHR5XrQmSkAH5AkfNg5CEhfH3N6vKNS6xhm+/M=
|
||||
SIZE (puppet-0.25.4.tar.gz) = 1424240
|
||||
MD5 (puppet-0.25.5.tar.gz) = KYg4WAHJZ/cmLN8IZAyeBw==
|
||||
RMD160 (puppet-0.25.5.tar.gz) = ybk075E1xbDVq+m5eiSR5SFFq7c=
|
||||
SHA1 (puppet-0.25.5.tar.gz) = XXc0XDWSbvtX/tu4/pfZrXF3Acg=
|
||||
SHA256 (puppet-0.25.5.tar.gz) = iAOBYKSpF5BHUBLfEDluYpLc85wEAqxC7fifdV+5sQU=
|
||||
SIZE (puppet-0.25.5.tar.gz) = 1446756
|
||||
|
||||
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-examples_etc_puppet_fileserver_conf,v 1.1 2010/05/18 18:44:37 robert Exp $
|
||||
--- examples/etc/puppet/fileserver.conf.orig Tue May 18 09:37:24 2010
|
||||
+++ examples/etc/puppet/fileserver.conf Tue May 18 09:37:09 2010
|
||||
@@ -5,9 +5,9 @@
|
||||
allow *.puppetlabs.com
|
||||
|
||||
[plugins]
|
||||
- path /var/lib/puppet/plugins
|
||||
+ path /var/puppet/plugins
|
||||
allow *.puppetlabs.com
|
||||
|
||||
[facts]
|
||||
- path /var/lib/puppet/facts
|
||||
+ path /var/puppet/facts
|
||||
allow *.puppetlabs.com
|
||||
@ -0,0 +1,29 @@
|
||||
$OpenBSD: patch-ext_regexp_nodes_regexp_nodes_rb,v 1.1 2010/05/18 18:44:37 robert Exp $
|
||||
--- ext/regexp_nodes/regexp_nodes.rb.orig Tue May 18 09:38:05 2010
|
||||
+++ ext/regexp_nodes/regexp_nodes.rb Tue May 18 09:38:18 2010
|
||||
@@ -43,14 +43,14 @@ require 'set'
|
||||
# set up some nice logging
|
||||
require 'logger'
|
||||
# XXX flip this for production vs local sandbox
|
||||
-# $LOG = Logger.new("/var/lib/puppet/log/extnodes.log")
|
||||
+# $LOG = Logger.new("/var/puppet/log/extnodes.log")
|
||||
# $LOG.level = Logger::FATAL
|
||||
$LOG = Logger.new($stderr)
|
||||
$LOG.level = Logger::DEBUG
|
||||
|
||||
# paths for files we use will be relative to this directory
|
||||
# XXX flip this for production vs local sandbox
|
||||
-# WORKINGDIR = "/var/lib/puppet/bin"
|
||||
+# WORKINGDIR = "/var/puppet/bin"
|
||||
WORKINGDIR = Dir.pwd
|
||||
|
||||
# This class holds all the methods for creating and accessing the properties
|
||||
@@ -154,7 +154,7 @@ class ExternalNode
|
||||
# directories to get the parameter name, then use the names of the files
|
||||
# contained in there for the values of those parameters.
|
||||
#
|
||||
- # ex: cat /var/lib/puppet/bin/parameters/environment/production
|
||||
+ # ex: cat /var/puppet/bin/parameters/environment/production
|
||||
# ^prodweb
|
||||
# would set parameters["environment"] = "production" for prodweb001
|
||||
def match_parameters(fullpath)
|
||||
@ -1,7 +1,16 @@
|
||||
$OpenBSD: patch-lib_puppet_defaults_rb,v 1.1 2008/04/08 01:58:39 mcbride Exp $
|
||||
--- lib/puppet/defaults.rb.orig Mon Mar 17 14:24:56 2008
|
||||
+++ lib/puppet/defaults.rb Mon Mar 24 18:42:21 2008
|
||||
@@ -301,8 +301,8 @@ module Puppet
|
||||
$OpenBSD: patch-lib_puppet_defaults_rb,v 1.2 2010/05/18 18:44:38 robert Exp $
|
||||
--- lib/puppet/defaults.rb.orig Tue May 18 02:40:49 2010
|
||||
+++ lib/puppet/defaults.rb Tue May 18 09:31:50 2010
|
||||
@@ -16,7 +16,7 @@ module Puppet
|
||||
else
|
||||
# Else, use system-wide directories.
|
||||
conf = "/etc/puppet"
|
||||
- var = "/var/lib/puppet"
|
||||
+ var = "/var/puppet"
|
||||
end
|
||||
|
||||
self.setdefaults(:main,
|
||||
@@ -403,8 +403,8 @@ module Puppet
|
||||
)
|
||||
|
||||
self.setdefaults(:puppetmasterd,
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-lib_puppet_reference_configuration_rb,v 1.1 2010/05/18 18:44:38 robert Exp $
|
||||
--- lib/puppet/reference/configuration.rb.orig Tue May 18 09:34:58 2010
|
||||
+++ lib/puppet/reference/configuration.rb Tue May 18 09:35:03 2010
|
||||
@@ -25,7 +25,7 @@ config = Puppet::Util::Reference.newreference(:configu
|
||||
str += ""
|
||||
val = object.default
|
||||
if name.to_s == "vardir"
|
||||
- val = "/var/lib/puppet"
|
||||
+ val = "/var/puppet"
|
||||
elsif name.to_s == "confdir"
|
||||
val = "/etc/puppet"
|
||||
end
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.7 2010/01/08 15:39:33 msf Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.8 2010/05/18 18:44:38 robert Exp $
|
||||
@newgroup _puppet:580
|
||||
@newuser _puppet:580:580:daemon:Puppet user:/var/empty:/sbin/nologin
|
||||
bin/filebucket
|
||||
@ -590,10 +590,11 @@ lib/ruby/site_ruby/${MODRUBY_REV}/puppet/util/suidmanager.rb
|
||||
lib/ruby/site_ruby/${MODRUBY_REV}/puppet/util/tagging.rb
|
||||
lib/ruby/site_ruby/${MODRUBY_REV}/puppet/util/user_attr.rb
|
||||
lib/ruby/site_ruby/${MODRUBY_REV}/puppet/util/warnings.rb
|
||||
lib/ruby/site_ruby/${MODRUBY_REV}/puppet/util/zaml.rb
|
||||
@man man/man5/puppet.conf.5.gz
|
||||
@man man/man8/filebucket.8.gz
|
||||
@man man/man8/pi.8.gz
|
||||
@man man/man8/puppet.8.gz
|
||||
@man man/man8/puppet.conf.8.gz
|
||||
@man man/man8/puppetca.8.gz
|
||||
@man man/man8/puppetd.8.gz
|
||||
@man man/man8/puppetdoc.8.gz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user