Version 0.23.0

epel9
David Lutterkort 18 years ago
parent 8bb22052ec
commit e18f387eca

@ -1 +1 @@
puppet-0.22.4.tgz puppet-0.23.0.tgz

@ -7,12 +7,12 @@
Summary: A network tool for managing many disparate systems Summary: A network tool for managing many disparate systems
Name: puppet Name: puppet
Version: 0.22.4 Version: 0.23.0
Release: 1%{?dist} Release: 1%{?dist}
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
URL: http://reductivelabs.com/projects/puppet/ URL: http://puppet.reductivelabs.com/
Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
Requires: ruby >= 1.8.1 Requires: ruby >= 1.8.1
@ -43,6 +43,8 @@ The server can also function as a certificate authority and file server.
%prep %prep
%setup -q %setup -q
cp -p conf/redhat/puppetd.conf conf/redhat/puppet.conf
sed -i -e 's/^\[puppet\]$/[main]/' conf/redhat/puppet.conf
%build %build
for f in bin/* ; do for f in bin/* ; do
@ -50,41 +52,47 @@ for f in bin/* ; do
done done
%install %install
%{__rm} -rf %{buildroot} rm -rf %{buildroot}
%{__install} -d -m0755 %{buildroot}%{_sbindir} install -d -m0755 %{buildroot}%{_sbindir}
%{__install} -d -m0755 %{buildroot}%{_bindir} install -d -m0755 %{buildroot}%{_bindir}
%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir} install -d -m0755 %{buildroot}%{ruby_sitelibdir}
%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
%{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version} install -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
%{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
%{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/puppet install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
%{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/puppet install -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
%{__install} -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_sbindir} install -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_sbindir}
%{__mv} %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet mv %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
%{__mv} %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun mv %{buildroot}%{_sbindir}/ralsh %{buildroot}%{_bindir}/ralsh
%{__install} -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb mv %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket
%{__cp} -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir} mv %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun
find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %{__chmod} a-x install -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb
%{__install} -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet cp -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir}
%{__install} -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r chmod a-x
%{__install} -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster install -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
%{__install} -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster install -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
%{__install} -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
%{__install} -Dp -m0644 %{confdir}/puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetd.conf install -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
%{__ln_s} puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
%{__ln_s} puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetca.conf install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
%{__install} -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet ln -s puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
ln -s puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
install -Dp -m0644 %{confdir}/puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
%files %files
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
%{_bindir}/puppet %{_bindir}/puppet
%{_bindir}/ralsh
%{_bindir}/filebucket
%{_sbindir}/puppetd %{_sbindir}/puppetd
%{ruby_sitelibdir}/* %{ruby_sitelibdir}/*
%{_initrddir}/puppet %{_initrddir}/puppet
%dir %{_sysconfdir}/puppet %dir %{_sysconfdir}/puppet
%config(noreplace) %{_sysconfdir}/sysconfig/puppet %config(noreplace) %{_sysconfdir}/sysconfig/puppet
%config(noreplace) %{_sysconfdir}/puppet/puppetd.conf %config(noreplace) %{_sysconfdir}/puppet/puppet.conf
%doc CHANGELOG COPYING LICENSE README TODO examples %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf
%doc CHANGELOG COPYING LICENSE README examples
%exclude %{_sbindir}/puppetdoc %exclude %{_sbindir}/puppetdoc
%config(noreplace) %{_sysconfdir}/logrotate.d/puppet %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
# These need to be owned by puppet so the server can # These need to be owned by puppet so the server can
@ -98,8 +106,11 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %
%{_sbindir}/puppetmasterd %{_sbindir}/puppetmasterd
%{_bindir}/puppetrun %{_bindir}/puppetrun
%{_initrddir}/puppetmaster %{_initrddir}/puppetmaster
%config(noreplace) %{_sysconfdir}/puppet/* %config(noreplace) %{_sysconfdir}/puppet/fileserver.conf
%dir %{_sysconfdir}/puppet/manifests
%config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster %config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster
%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetca.conf
%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetmasterd.conf
%{_sbindir}/puppetca %{_sbindir}/puppetca
%pre %pre
@ -134,9 +145,14 @@ if [ "$1" -ge 1 ]; then
fi fi
%clean %clean
%{__rm} -rf %{buildroot} rm -rf %{buildroot}
%changelog %changelog
* Wed Jun 20 2007 David Lutterkort <dlutter@redhat.com> - 0.23.0-1
- Install one puppet.conf instead of old config files, keep old configs
around to ease update
- Use plain shell commands in install instead of macros
* Wed May 2 2007 David Lutterkort <dlutter@redhat.com> - 0.22.4-1 * Wed May 2 2007 David Lutterkort <dlutter@redhat.com> - 0.22.4-1
- New version - New version

@ -1 +1 @@
9bb853104f2616c7f2c8fa4e2f39b537 puppet-0.22.4.tgz c43342d7d24f1fe881ec97b59e7ea02d puppet-0.23.0.tgz

Loading…
Cancel
Save