No OneTemporary
Actions

Size

17 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec
	index 3ec86c8d6..ce1e7d321 100644
	--- a/conf/redhat/puppet.spec
	+++ b/conf/redhat/puppet.spec
	@@ -1,157 +1,157 @@
	%define rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
	%define _pbuild %{_builddir}/%{name}-%{version}
	%define confdir conf/redhat

	Summary: A network tool for managing many disparate systems
	Name: puppet
	-Version: 0.13.2
	-Release: 2%{?dist}
	+Version: 0.13.4
	+Release: 1%{?dist}
	License: GPL
	Group: System Environment/Base

	URL: http://reductivelabs.com/projects/puppet/
	Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz

	Requires: ruby >= 1.8.1
	Requires: facter >= 1.1
	Requires: fedora-usermgmt
	BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
	BuildArchitectures: noarch

	%description
	Puppet lets you centrally manage every important aspect of your system using a
	cross-platform specification language that manages all the separate elements
	normally aggregated in different files, like users, cron jobs, and hosts,
	along with obviously discrete elements like packages, services, and files.

	%package server
	Group: System Environment/Base
	Summary: Server for the puppet system management tool
	Requires: puppet = %{version}-%{release}

	%description server
	Provides the central puppet server daemon which provides manifests to clients.
	The server can also function as a certificate authority and file server.

	%prep
	%setup -q

	%install
	%{__rm} -rf %{buildroot}
	%{__install} -d -m0755 %{buildroot}%{_sbindir}
	%{__install} -d -m0755 %{buildroot}%{_bindir}
	%{__install} -d -m0755 %{buildroot}%{rubylibdir}
	%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
	%{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
	%{__install} -d -m0755 %{buildroot}%{_localstatedir}/puppet
	%{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
	%{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
	%{__install} -Dp -m0755 %{_pbuild}/bin/* %{buildroot}%{_sbindir}
	%{__mv} %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
	%{__install} -Dp -m0644 %{_pbuild}/lib/puppet.rb %{buildroot}%{rubylibdir}/puppet.rb
	%{__cp} -a %{_pbuild}/lib/puppet %{buildroot}%{rubylibdir}
	find %{buildroot}%{rubylibdir} -type f -perm +ugo+x -print0 \| xargs -0 -r %{__chmod} a-x
	%{__install} -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
	%{__install} -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
	%{__install} -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
	%{__install} -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
	%{__install} -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
	%{__install} -Dp -m0644 %{confdir}/puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
	%{__install} -Dp -m0644 %{confdir}/puppetmasterd.conf %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
	%{__install} -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet

	%files
	%defattr(-, root, root, 0755)
	%{_bindir}/puppet
	%{_sbindir}/puppetd
	%{rubylibdir}/*
	%{_localstatedir}/puppet
	%{_initrddir}/puppet
	%config(noreplace) %{_sysconfdir}/sysconfig/puppet
	%config(noreplace) %{_sysconfdir}/puppet/puppetd.conf
	%doc CHANGELOG COPYING LICENSE README TODO examples
	%exclude %{_sbindir}/puppetdoc
	%config(noreplace) %{_sysconfdir}/logrotate.d/puppet
	# These need to be owned by puppet so the server can
	# write to them
	%attr(-, puppet, puppet) %{_localstatedir}/run/puppet
	%attr(-, puppet, puppet) %{_localstatedir}/log/puppet

	%files server
	%{_sbindir}/puppetmasterd
	%{_initrddir}/puppetmaster
	%config(noreplace) %{_sysconfdir}/puppet/*
	%config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster
	%{_sbindir}/cf2puppet
	%{_sbindir}/puppetca

	%pre
	/usr/sbin/fedora-groupadd 24 puppet
	/usr/sbin/fedora-useradd 24 -g puppet -c "Puppet" \
	-s /sbin/nologin -r -d /var/puppet puppet 2> /dev/null \|\| :

	%post
	touch %{_localstatedir}/log/puppet.log
	/sbin/chkconfig --add puppet
	exit 0

	%post server
	touch %{_localstatedir}/log/puppetmaster.log
	touch %{_localstatedir}/log/puppetmaster-http.log
	/sbin/chkconfig --add puppetmaster

	%preun
	if [ "$1" = 0 ] ; then
	/sbin/service puppet stop > /dev/null 2>&1
	/sbin/chkconfig --del puppet
	fi

	%preun server
	if [ "$1" = 0 ] ; then
	/sbin/service puppetmaster stop > /dev/null 2>&1
	/sbin/chkconfig --del puppetmaster
	fi

	%postun server
	if [ "$1" -ge 1 ]; then
	/sbin/service puppetmaster condrestart > /dev/null 2>&1
	fi

	%clean
	%{__rm} -rf %{buildroot}

	%changelog
	* Sun Feb 19 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-4
	- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed
	problem with listing fileserver.conf and puppetmaster.conf twice

	* Wed Feb 8 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-3
	- Fix puppetd.conf

	* Wed Feb 8 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-2
	- Changes to run puppetmaster as user puppet

	* Mon Feb 6 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-1
	- Don't mark initscripts as config files

	* Mon Feb 6 2006 David Lutterkort <dlutter@redhat.com> - 0.12.0-2
	- Fix BuildRoot. Add dist to release

	* Tue Jan 17 2006 David Lutterkort <dlutter@redhat.com> - 0.11.0-1
	- Rebuild

	* Thu Jan 12 2006 David Lutterkort <dlutter@redhat.com> - 0.10.2-1
	- Updated for 0.10.2 Fixed minor kink in how Source is given

	* Wed Jan 11 2006 David Lutterkort <dlutter@redhat.com> - 0.10.1-3
	- Added basic fileserver.conf

	* Wed Jan 11 2006 David Lutterkort <dlutter@redhat.com> - 0.10.1-1
	- Updated. Moved installation of library files to sitelibdir. Pulled
	initscripts into separate files. Folded tools rpm into server

	* Thu Nov 24 2005 Duane Griffin <d.griffin@psenterprise.com>
	- Added init scripts for the client

	* Wed Nov 23 2005 Duane Griffin <d.griffin@psenterprise.com>
	- First packaging
	diff --git a/lib/puppet.rb b/lib/puppet.rb
	index a5707c69d..0f41dddc6 100644
	--- a/lib/puppet.rb
	+++ b/lib/puppet.rb
	@@ -1,344 +1,344 @@
	require 'singleton'
	require 'puppet/event-loop'
	require 'puppet/log'
	require 'puppet/config'
	require 'puppet/util'

	# see the bottom of the file for further inclusions

	#------------------------------------------------------------
	# the top-level module
	#
	# all this really does is dictate how the whole system behaves, through
	# preferences for things like debugging
	#
	# it's also a place to find top-level commands like 'debug'
	module Puppet
	- PUPPETVERSION = '0.13.2'
	+ PUPPETVERSION = '0.13.4'

	def Puppet.version
	return PUPPETVERSION
	end

	class Error < RuntimeError
	attr_accessor :stack, :line, :file
	attr_writer :backtrace

	def backtrace
	if defined? @backtrace
	return @backtrace
	else
	return super
	end
	end

	def initialize(message)
	@message = message
	end

	def to_s
	str = nil
	if defined? @file and defined? @line and @file and @line
	str = "%s in file %s at line %s" %
	[@message.to_s, @file, @line]
	elsif defined? @line and @line
	str = "%s at line %s" %
	[@message.to_s, @line]
	else
	str = @message.to_s
	end

	#if Puppet[:debug] and @stack
	# str += @stack.to_s
	#end

	return str
	end
	end

	class DevError < Error; end

	def self.name
	$0.gsub(/.+#{File::SEPARATOR}/,'')
	end

	# the hash that determines how our system behaves
	@@config = Puppet::Config.new

	# define helper messages for each of the message levels
	Puppet::Log.eachlevel { \|level\|
	define_method(level,proc { \|args\|
	if args.is_a?(Array)
	args = args.join(" ")
	end
	Puppet::Log.create(
	:level => level,
	:message => args
	)
	})
	module_function level
	}

	# I keep wanting to use Puppet.error
	# XXX this isn't actually working right now
	alias :error :err

	# Store a new default value.
	def self.setdefaults(section, *arrays)
	start = Time.now
	@@config.setdefaults(section, *arrays)
	end

	# If we're running the standalone puppet process as a non-root user,
	# use basedirs that are in the user's home directory.
	conf = nil
	var = nil
	if self.name == "puppet" and Process.uid != 0
	conf = File.expand_path("~/.puppet")
	var = File.expand_path("~/.puppet/var")
	else
	# Else, use system-wide directories.
	conf = "/etc/puppet"
	var = "/var/puppet"
	end
	self.setdefaults("puppet",
	[:confdir, conf, "The main Puppet configuration directory."],
	[:vardir, var, "Where Puppet stores dynamic and growing data."]
	)

	# Define the config default.
	self.setdefaults(self.name,
	[:config, "$confdir/#{self.name}.conf",
	"The configuration file for #{self.name}."]
	)

	self.setdefaults("puppet",
	[:logdir, "$vardir/log",
	"The Puppet log directory."],
	[:bucketdir, "$vardir/bucket",
	"Where FileBucket files are stored."],
	[:statedir, "$vardir/state",
	"The directory where Puppet state is stored. Generally, this
	directory can be removed without causing harm (although it might
	result in spurious service restarts)."],
	[:rundir, "$vardir/run", "Where Puppet PID files are kept."],
	[:lockdir, "$vardir/locks", "Where lock files are kept."],
	[:statefile, "$statedir/state.yaml",
	"Where puppetd and puppetmasterd store state associated with the
	running configuration. In the case of puppetmasterd, this file
	reflects the state discovered through interacting with clients."],
	[:ssldir, "$confdir/ssl", "Where SSL certificates are kept."],
	[:genconfig, false,
	"Whether to just print a configuration to stdout and exit. Only makes
	sense when used interactively. Takes into account arguments specified
	on the CLI."],
	[:genmanifest, false,
	"Whether to just print a manifest to stdout and exit. Only makes
	sense when used interactively. Takes into account arguments specified
	on the CLI."]
	)
	self.setdefaults("puppetmasterd",
	[:manifestdir, "$confdir/manifests",
	"Where puppetmasterd looks for its manifests."],
	[:manifest, "$manifestdir/site.pp",
	"The entry-point manifest for puppetmasterd."],
	[:masterlog, "$logdir/puppetmaster.log",
	"Where puppetmasterd logs. This is generally not used, since syslog
	is the default log destination."],
	[:masterhttplog, "$logdir/masterhttp.log",
	"Where the puppetmasterd web server logs."],
	[:masterport, 8140, "Which port puppetmasterd listens on."],
	[:parseonly, false, "Just check the syntax of the manifests."]
	)

	self.setdefaults("puppetd",
	[:localconfig, "$confdir/localconfig",
	"Where puppetd caches the local configuration. An extension reflecting
	the cache format is added automatically."],
	[:classfile, "$confdir/classes.txt",
	"The file in which puppetd stores a list of the classes associated
	with the retrieved configuratiion."],
	[:puppetdlog, "$logdir/puppetd.log",
	"The log file for puppetd. This is generally not used."],
	[:httplog, "$logdir/http.log", "Where the puppetd web server logs."],
	[:server, "puppet",
	"The server to which server puppetd should connect"],
	[:user, "puppet", "The user puppetmasterd should run as."],
	[:group, "puppet", "The group puppetmasterd should run as."],
	[:ignoreschedules, false,
	"Boolean; whether puppetd should ignore schedules. This is useful
	for initial puppetd runs."],
	[:puppetport, 8139, "Which port puppetd listens on."],
	[:noop, false, "Whether puppetd should be run in noop mode."],
	[:runinterval, 1800, # 30 minutes
	"How often puppetd applies the client configuration; in seconds"]
	)
	self.setdefaults("metrics",
	[:rrddir, "$vardir/rrd",
	"The directory where RRD database files are stored."],
	[:rrdgraph, false, "Whether RRD information should be graphed."]
	)

	# configuration parameter access and stuff
	def self.[](param)
	case param
	when :debug:
	if Puppet::Log.level == :debug
	return true
	else
	return false
	end
	else
	return @@config[param]
	end
	end

	# configuration parameter access and stuff
	def self.[]=(param,value)
	@@config[param] = value
	# case param
	# when :debug:
	# if value
	# Puppet::Log.level=(:debug)
	# else
	# Puppet::Log.level=(:notice)
	# end
	# when :loglevel:
	# Puppet::Log.level=(value)
	# when :logdest:
	# Puppet::Log.newdestination(value)
	# else
	# @@config[param] = value
	# end
	end

	def self.clear
	@@config.clear
	end

	def self.debug=(value)
	if value
	Puppet::Log.level=(:debug)
	else
	Puppet::Log.level=(:notice)
	end
	end

	def self.config
	@@config
	end

	def self.genconfig
	if Puppet[:genconfig]
	puts Puppet.config.to_config
	exit(0)
	end
	end

	def self.genmanifest
	if Puppet[:genmanifest]
	puts Puppet.config.to_manifest
	exit(0)
	end
	end

	# Start our event loop. This blocks, waiting for someone, somewhere,
	# to generate events of some kind.
	def self.start
	#Puppet.info "Starting loop"
	EventLoop.current.run
	end

	# Create the timer that our different objects (uh, mostly the client)
	# check.
	def self.timer
	unless defined? @timer
	#Puppet.info "Interval is %s" % Puppet[:runinterval]
	#@timer = EventLoop::Timer.new(:interval => Puppet[:runinterval])
	@timer = EventLoop::Timer.new(
	:interval => Puppet[:runinterval],
	:tolerance => 1,
	:start? => true
	)
	EventLoop.current.monitor_timer @timer
	end
	@timer
	end

	# Store a new default value.
	# def self.setdefaults(section, hash)
	# @@config.setdefaults(section, hash)
	# if value.is_a?(Array)
	# if value[0].is_a?(Symbol)
	# unless @defaults.include?(value[0])
	# raise ArgumentError, "Unknown basedir %s for param %s" %
	# [value[0], param]
	# end
	# else
	# raise ArgumentError, "Invalid default %s for param %s" %
	# [value.inspect, param]
	# end
	#
	# unless value[1].is_a?(String)
	# raise ArgumentError, "Invalid default %s for param %s" %
	# [value.inspect, param]
	# end
	#
	# unless value.length == 2
	# raise ArgumentError, "Invalid default %s for param %s" %
	# [value.inspect, param]
	# end
	#
	# @defaults[param] = value
	# else
	# @defaults[param] = value
	# end
	# end

	# XXX this should all be done using puppet objects, not using
	# normal mkdir
	def self.recmkdir(dir,mode = 0755)
	if FileTest.exist?(dir)
	return false
	else
	tmp = dir.sub(/^\//,'')
	path = [File::SEPARATOR]
	tmp.split(File::SEPARATOR).each { \|dir\|
	path.push dir
	if ! FileTest.exist?(File.join(path))
	begin
	Dir.mkdir(File.join(path), mode)
	rescue Errno::EACCES => detail
	Puppet.err detail.to_s
	return false
	rescue => detail
	Puppet.err "Could not create %s: %s" % [path, detail.to_s]
	return false
	end
	elsif FileTest.directory?(File.join(path))
	next
	else FileTest.exist?(File.join(path))
	raise Puppet::Error, "Cannot create %s: basedir %s is a file" %
	[dir, File.join(path)]
	end
	}
	return true
	end
	end

	# Create a new type. Just proxy to the Type class.
	def self.newtype(name, parent = nil, &block)
	Puppet::Type.newtype(name, parent, &block)
	end

	# Retrieve a type by name. Just proxy to the Type class.
	def self.type(name)
	Puppet::Type.type(name)
	end
	end

	require 'puppet/server'
	require 'puppet/type'
	require 'puppet/storage'

	# $Id$

File Metadata

Mime Type: text/x-diff
Expires: Fri, Nov 1, 8:33 AM (1 d, 7 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 10075101
Default Alt Text: (17 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions