Issue #4249 has been updated by Ben Kevan.
--- old/client.init 2010-05-08 05:31:35.000000000 -0700
+++ new/client.init 2010-07-15 14:44:09.138893545 -0700
@@ -14,8 +14,9 @@
### BEGIN INIT INFO
# Provides: puppet
# Required-Start: $local_fs $network $syslog
-# Should-Start:
-# Required-Stop:
+# Should-Start: $null
+# Required-Stop: $null
+# Should-Stop: $null
# Default-Start: 3 4 5
# Default-Stop: 0 1 2 6
# Short-Description: puppet
--- old/puppet.spec 2010-07-14 14:26:57.773797559 -0700
+++ new/puppet.spec 2010-07-15 14:44:11.109891799 -0700
@@ -1,31 +1,35 @@
%{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts
Config::CONFIG["sitelibdir"]')}
%define pbuild %{_builddir}/%{name}-%{version}
-%define suseconfdir conf/suse
%define confdir conf/redhat
Summary: A network tool for managing many disparate systems
Name: puppet
Version: 0.25.5
-Release: 1%{?dist}
+Release: 1
License: GPL
-Group: System Environment/Base
+Group: Productivity/Networking/System
-URL: http://puppetlabs.com/projects/puppet/
-Source: http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
+URL: http://reductivelabs.com/projects/puppet/
+Source0: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tar.gz
+Source1: client.init
+Source2: server.init
Patch0: puppet.suse.patch
-Requires: ruby >= 1.8.2
-Requires: facter >= 1.3.7
+
+PreReq: %{insserv_prereq} %{fillup_prereq}
+Requires: ruby >= 1.8.1
+Requires: facter >= 1.1.4
+Requires: cron
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ruby >= 1.8.2
+BuildRequires: ruby >= 1.8.1
%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,
+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
+Group: Productivity/Networking/System
Summary: Server for the puppet system management tool
Requires: puppet = %{version}-%{release}
@@ -43,7 +47,6 @@
done
%install
-%{__rm} -rf %{buildroot}
%{__install} -d -m0755 %{buildroot}%{_sbindir}
%{__install} -d -m0755 %{buildroot}%{_bindir}
%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
@@ -52,36 +55,41 @@
%{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
%{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
%{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
-%{__install} -Dp -m0755 %{pbuild}/bin/* %{pbuild}/sbin/*
%{buildroot}%{_sbindir}
+%{__install} -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_sbindir}
+%{__install} -Dp -m0755 %{pbuild}/sbin/* %{buildroot}%{_sbindir}
%{__mv} %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
%{__mv} %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun
-%{__mv} %{buildroot}%{_sbindir}/pi %{buildroot}%{_bindir}/pi
-%{__mv} %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket
%{__install} -Dp -m0644 %{pbuild}/lib/puppet.rb
%{buildroot}%{ruby_sitelibdir}/puppet.rb
%{__cp} -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir}
-find %{buildroot}%{ruby_sitelibdir} -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 %{suseconfdir}/client.init
%{buildroot}%{_initrddir}/puppet
-%{__install} -Dp -m0644 %{confdir}/server.sysconfig
%{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
-%{__install} -Dp -m0755 %{suseconfdir}/server.init
%{buildroot}%{_initrddir}/puppetmaster
+find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -exec chmod a-x '{}'
\;
+%{__install} -Dp -m0644 %{confdir}/client.sysconfig
%{buildroot}/var/adm/fillup-templates/sysconfig.puppet
+%{__install} -Dp -m0755 %SOURCE1 %{buildroot}%{_initrddir}/puppet
+%{__install} -Dp -m0644 %{confdir}/server.sysconfig
%{buildroot}/var/adm/fillup-templates/sysconfig.puppetmaster
+%{__install} -Dp -m0755 %SOURCE2 %{buildroot}%{_initrddir}/puppetmaster
%{__install} -Dp -m0644 %{confdir}/fileserver.conf
%{buildroot}%{_sysconfdir}/puppet/fileserver.conf
%{__install} -Dp -m0644 %{confdir}/puppet.conf
%{buildroot}%{_sysconfdir}/puppet/puppet.conf
+#%{__ln_s} puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
+#%{__ln_s} puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
%{__install} -Dp -m0644 %{confdir}/logrotate
%{buildroot}%{_sysconfdir}/logrotate.d/puppet
+%{__ln_s} %{_initrddir}/puppet %{buildroot}%{_sbindir}/rcpuppet
+%{__ln_s} %{_initrddir}/puppetmaster %{buildroot}%{_sbindir}/rcpuppetmaster
%files
%defattr(-, root, root, 0755)
%{_bindir}/puppet
-%{_bindir}/pi
-%{_bindir}/filebucket
+%{_sbindir}/filebucket
%{_sbindir}/ralsh
%{_sbindir}/puppetd
+%{_sbindir}/rcpuppet
+%{_sbindir}/pi
%{ruby_sitelibdir}/*
%{_initrddir}/puppet
-%config(noreplace) %{_sysconfdir}/sysconfig/puppet
+/var/adm/fillup-templates/sysconfig.puppet
%config(noreplace) %{_sysconfdir}/puppet/puppet.conf
%doc CHANGELOG COPYING LICENSE README examples
%exclude %{_sbindir}/puppetdoc
%config(noreplace) %{_sysconfdir}/logrotate.d/puppet
+%dir %{_sysconfdir}/puppet
# These need to be owned by puppet so the server can
# write to them
%attr(-, puppet, puppet) %{_localstatedir}/run/puppet
@@ -91,76 +99,109 @@
%files server
%defattr(-, root, root, 0755)
%{_sbindir}/puppetmasterd
+%{_sbindir}/rcpuppetmaster
%{_sbindir}/puppetqd
%{_bindir}/puppetrun
%{_initrddir}/puppetmaster
%config(noreplace) %{_sysconfdir}/puppet/*
-%config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster
+%exclude %{_sysconfdir}/puppet/puppet.conf
+/var/adm/fillup-templates/sysconfig.puppetmaster
%{_sbindir}/puppetca
+%dir %{_sysconfdir}/puppet
%pre
/usr/sbin/groupadd -r puppet 2>/dev/null || :
/usr/sbin/useradd -g puppet -c "Puppet" \
- -s /sbin/nologin -r -d /var/lib/puppet puppet 2> /dev/null || :
+ -s /sbin/nologin -r -d /var/puppet puppet 2> /dev/null || :
+
+%post
+%{fillup_and_insserv -y puppet}
+
+%post server
+%{fillup_and_insserv -n -y puppetmaster}
+
+%preun
+%stop_on_removal puppet
+
+%preun server
+%stop_on_removal puppetmaster
+
+%postun
+%restart_on_update puppet
+%{insserv_cleanup}
-#%post
-#/sbin/chkconfig --add puppeti
-#exit 0
-
-#%post server
-#/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 try-restart > /dev/null 2>&1
-#fi
-
-%post
-%{fillup_and_insserv -y puppet}
-
-%post server
-%{fillup_and_insserv -n -y puppet-server}
-
-%preun
-%stop_on_removal puppet
-
-%preun server
-%stop_on_removal puppet-server
-
-%postun
-%restart_on_update puppet
-%{insserv_cleanup}
-
-%postun server
-%restart_on_update puppet-server
-%{insserv_cleanup}
+%postun server
+%restart_on_update puppetmaster
+%{insserv_cleanup}
%clean
%{__rm} -rf %{buildroot}
%changelog
-* Sat Feb 16 2008 James Turnbull <[email protected]> - 0.24.1-1
-- Fixed puppet configuation file references to match single puppet.conf file
-- Update versions for 0.24.1 release
+* Wed Jul 14 2010 Ben Kevan <[email protected]> - 0.25.5
+- New version.
+- Use original client, server.init names
+- Revert to puppetmaster
+- Fixed client.init and server.init and included $null and Should-Stop for both
+
+* Tue Mar 2 2010 Martin Vuk <[email protected]> - 0.25.4
+- New version.
+
+* Sun Aug 9 2009 Noah Fontes <[email protected]>
+- Fix build on SLES 9.
+- Enable puppet and puppet-server services by default.
+
+* Sat Aug 8 2009 Noah Fontes <[email protected]>
+- Fix a lot of relevant warnings from rpmlint.
+- Build on OpenSUSE 11.1 correctly.
+- Rename puppetmaster init scripts to puppet-server to correspond to the
package name.
+
+* Wed Apr 22 2009 Leo Eraly <[email protected]> - 0.24.8
+- New version.
+
+* Tue Dec 9 2008 Leo Eraly <[email protected]> - 0.24.6
+- New version.
+
+* Fri Sep 5 2008 Leo Eraly <[email protected]> - 0.24.5
+- New version.
+
+* Fri Jun 20 2008 Martin Vuk <[email protected]> - 0.24.4
+- Removed symlinks to old configuration files
+
+* Fri Dec 14 2007 Martin Vuk <[email protected]> - 0.24.0
+- New version.
+
+* Fri Jun 29 2007 Martin Vuk <[email protected]> - 0.23.0
+- New version.
+
+* Wed May 2 2007 Martin Vuk <[email protected]> - 0.22.4
+- New version. Includes provider for rug package manager.
+
+* Wed Apr 25 2007 Martin Vuk <[email protected]> - 0.22.3
+- New version. Added links /sbin/rcpuppet and /sbin/rcpuppetmaster
+
+* Sun Jan 7 2007 Martin Vuk <[email protected]> - 0.22.0
+- version bump
+
+* Tue Oct 3 2006 Martin Vuk <[email protected]> - 0.19.3-3
+- Made package arch dependant.
+
+* Sat Sep 23 2006 Martin Vuk <[email protected]> - 0.19.3-1
+- New version
+
+* Sun Sep 17 2006 Martin Vuk <[email protected]> - 0.19.1-1
+- New version
+
+* Tue Aug 30 2006 Martin Vuk <[email protected]> - 0.19.0-1
+- New version
+- No need to patch anymore :-), since my changes went into official release.
* Tue Aug 3 2006 Martin Vuk <[email protected]> - 0.18.4-3
- Replaced puppet-bin.patch with %build section from David's spec
* Tue Aug 1 2006 Martin Vuk <[email protected]> - 0.18.4-2
- Added supprot for enabling services in SuSE
-
+
* Tue Aug 1 2006 Martin Vuk <[email protected]> - 0.18.4-1
- New version and support for SuSE
@@ -172,7 +213,7 @@
* Mon Jun 19 2006 David Lutterkort <[email protected]> - 0.18.0-1
- Patch config for LSB compliance (lsb-config.patch)
-- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl
+- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl
to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt,
/etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml
@@ -195,7 +236,7 @@
- Rebuilt for new version
* Wed Mar 22 2006 David Lutterkort <[email protected]> - 0.15.1-1
-- Patch0: Run puppetmaster as root; running as puppet is not ready
+- Patch0: Run puppetmaster as root; running as puppet is not ready
for primetime
* Mon Mar 13 2006 David Lutterkort <[email protected]> - 0.15.0-1
@@ -210,7 +251,7 @@
allocate the puppet uid/gid dynamically
* Sun Feb 19 2006 David Lutterkort <[email protected]> - 0.13.0-4
-- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed
+- 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 <[email protected]> - 0.13.0-3
@@ -235,7 +276,7 @@
- Added basic fileserver.conf
* Wed Jan 11 2006 David Lutterkort <[email protected]> - 0.10.1-1
-- Updated. Moved installation of library files to sitelibdir. Pulled
+- Updated. Moved installation of library files to sitelibdir. Pulled
initscripts into separate files. Folded tools rpm into server
* Thu Nov 24 2005 Duane Griffin <[email protected]>
--- old/server.init 2010-05-08 05:31:35.000000000 -0700
+++ new/server.init 2010-07-15 14:44:14.830900530 -0700
@@ -12,8 +12,9 @@
### BEGIN INIT INFO
# Provides: puppetmaster
# Required-Start: $local_fs $network $syslog
-# Should-Start:
-# Required-Stop:
+# Should-Start: $null
+# Required-Stop: $null
+# Should-Stop: $null
# Default-Start: 3 4 5
# Default-Stop: 0 1 2 6
# Short-Description: puppetmaster
----------------------------------------
Bug #4249: suse init / spec files were outdated, and did not work on new
versions of sles
http://projects.puppetlabs.com/issues/4249
Author: Ben Kevan
Status: Unreviewed
Priority: Normal
Assigned to:
Category:
Target version:
Affected version: 0.25.5
Keywords:
Branch:
The files in conf/suse are out dated.. giving some patches to update.
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://projects.puppetlabs.com/my/account
--
You received this message because you are subscribed to the Google Groups
"Puppet Bugs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-bugs?hl=en.
