Changes to make puppet package more LSB compliant. Update specfile for very latest Fedora ruby packaging guidelines. lsb-config.patch only checked in for documentation purposes, since changes are part of this checkin.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1314 980ebf18-57e1-0310-9a29-db15c13687c0

5 files changed, 109 insertions, 24 deletions

diff --git a/conf/redhat/fileserver.conf b/conf/redhat/fileserver.conf
index 4e93f7449..f38aed7dd 100644
--- a/conf/redhat/fileserver.conf
+++ b/conf/redhat/fileserver.conf
@@ -6,7 +6,7 @@
 # for allow/deny does not matter, allow always takes precedence
 # over deny
 [files]
-  path /var/puppet/files
+  path /var/lib/puppet/files
 #  allow *.example.com
 #  deny *.evil.example.com
 #  allow 192.168.0.0/24
diff --git a/conf/redhat/lsb-config.patch b/conf/redhat/lsb-config.patch
new file mode 100644
index 000000000..7a18cd361
--- /dev/null
+++ b/conf/redhat/lsb-config.patch
@@ -0,0 +1,51 @@
+--- puppet-0.18.0/conf/redhat/fileserver.conf.orig	2006-06-20 12:13:49.000000000 -0700
++++ puppet-0.18.0/conf/redhat/fileserver.conf	2006-06-20 12:14:03.000000000 -0700
+@@ -6,7 +6,7 @@
+ # for allow/deny does not matter, allow always takes precedence
+ # over deny
+ [files]
+-  path /var/puppet/files
++  path /var/lib/puppet/files
+ #  allow *.example.com
+ #  deny *.evil.example.com
+ #  allow 192.168.0.0/24
+--- puppet-0.18.0/conf/redhat/puppetd.conf.orig	2006-06-20 12:12:01.000000000 -0700
++++ puppet-0.18.0/conf/redhat/puppetd.conf	2006-06-20 12:14:37.000000000 -0700
+@@ -1,5 +1,33 @@
++[puppet]
++    # Where Puppet stores dynamic and growing data.
++    # The default value is '/var/puppet'.
++    vardir = /var/lib/puppet
++
++    # The Puppet log directory.
++    # The default value is '$vardir/log'.
++    logdir = /var/log/puppet
++
++    # Where Puppet PID files are kept.
++    # The default value is '$vardir/run'.
++    rundir = /var/run/puppet
++
++    # Where lock files are kept.
++    # The default value is '$vardir/locks'.
++    lockdir = /var/lock
++
++    # Where SSL certificates are kept.
++    # The default value is '$confdir/ssl'.
++    ssldir = $vardir/ssl
++
+ [puppetd]
+-# Make sure all log messages are sent to the right directory
+-# This directory must be writable by the puppet user
+-logdir=/var/log/puppet
+-rundir=/var/run
++    # The file in which puppetd stores a list of the classes
++    # associated with the retrieved configuratiion.  Can be loaded in
++    # the separate ``puppet`` executable using the ``--loadclasses``
++    # option.
++    # The default value is '$confdir/classes.txt'.
++    classfile = $vardir/classes.txt
++
++    # Where puppetd caches the local configuration.  An
++    # extension indicating the cache format is added automatically.
++    # The default value is '$confdir/localconfig'.
++    localconfig = $vardir/localconfig
diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec
index 993caeca8..1f15bb4b7 100644
--- a/conf/redhat/puppet.spec
+++ b/conf/redhat/puppet.spec
@@ -1,5 +1,5 @@
-%define rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
-%define _pbuild %{_builddir}/%{name}-%{version}
+%{!?ruby_sitelibdir: %define ruby_sitelibdir %(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
@@ -11,13 +11,14 @@ Group: System Environment/Base
 
 URL: http://reductivelabs.com/projects/puppet/
 Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
+#Patch0: yumrepo.patch
+#Patch1: lsb-config.patch
 
 Requires: ruby >= 1.8.1
+Requires: ruby(abi) = 1.8
 Requires: facter >= 1.1.4
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# It's not possible to build ruby noarch packages currently
-# See bz184199
-#BuildArchitectures: noarch
+BuildArchitectures: noarch
 BuildRequires: ruby >= 1.8.1
 
 %description
@@ -37,37 +38,40 @@ The server can also function as a certificate authority and file server.
 
 %prep
 %setup -q
+#%patch0 -p1
+#%patch1 -p1
 
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -d -m0755 %{buildroot}%{_sbindir}
 %{__install} -d -m0755 %{buildroot}%{_bindir}
-%{__install} -d -m0755 %{buildroot}%{rubylibdir}
+%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
 %{__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}/lib/puppet
 %{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/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}/puppetrun %{buildroot}%{_bindir}/puppetrun
-%{__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 %{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 %{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
+%{__ln_s} puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
+%{__ln_s} puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
 %{__install} -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
 
 %files
 %defattr(-, root, root, 0755)
 %{_bindir}/puppet
 %{_sbindir}/puppetd
-%{rubylibdir}/*
+%{ruby_sitelibdir}/*
 %{_initrddir}/puppet
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
 %config(noreplace) %{_sysconfdir}/puppet/puppetd.conf
@@ -78,7 +82,7 @@ find %{buildroot}%{rubylibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %{__ch
 # write to them
 %attr(-, puppet, puppet) %{_localstatedir}/run/puppet
 %attr(-, puppet, puppet) %{_localstatedir}/log/puppet
-%attr(-, puppet, puppet) %{_localstatedir}/puppet
+%attr(-, puppet, puppet) %{_localstatedir}/lib/puppet
 
 %files server
 %defattr(-, root, root, 0755)
@@ -123,8 +127,15 @@ fi
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Jun 19 2006 David Lutterkort <dlutter@redhat.com> - 0.18.0-1
+- Patch config for LSB compliance (lsb-config.patch)
+- 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
+
 * Fri May 19 2006 David Lutterkort <dlutter@redhat.com> - 0.17.2-1
 - Added /usr/bin/puppetrun to server subpackage
+- Backported patch for yumrepo type (yumrepo.patch)
 
 * Wed May  3 2006 David Lutterkort <dlutter@redhat.com> - 0.16.4-1
 - Rebuilt
diff --git a/conf/redhat/puppetd.conf b/conf/redhat/puppetd.conf
index 521e3a38b..1da859505 100644
--- a/conf/redhat/puppetd.conf
+++ b/conf/redhat/puppetd.conf
@@ -1,5 +1,33 @@
+[puppet]
+    # Where Puppet stores dynamic and growing data.
+    # The default value is '/var/puppet'.
+    vardir = /var/lib/puppet
+
+    # The Puppet log directory.
+    # The default value is '$vardir/log'.
+    logdir = /var/log/puppet
+
+    # Where Puppet PID files are kept.
+    # The default value is '$vardir/run'.
+    rundir = /var/run/puppet
+
+    # Where lock files are kept.
+    # The default value is '$vardir/locks'.
+    lockdir = /var/lock
+
+    # Where SSL certificates are kept.
+    # The default value is '$confdir/ssl'.
+    ssldir = $vardir/ssl
+
 [puppetd]
-# Make sure all log messages are sent to the right directory
-# This directory must be writable by the puppet user
-logdir=/var/log/puppet
-rundir=/var/run
+    # The file in which puppetd stores a list of the classes
+    # associated with the retrieved configuratiion.  Can be loaded in
+    # the separate ``puppet`` executable using the ``--loadclasses``
+    # option.
+    # The default value is '$confdir/classes.txt'.
+    classfile = $vardir/classes.txt
+
+    # Where puppetd caches the local configuration.  An
+    # extension indicating the cache format is added automatically.
+    # The default value is '$confdir/localconfig'.
+    localconfig = $vardir/localconfig
diff --git a/conf/redhat/puppetmasterd.conf b/conf/redhat/puppetmasterd.conf
deleted file mode 100644
index 9cf6c3e5d..000000000
--- a/conf/redhat/puppetmasterd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[puppetmasterd]
-# Make sure all log messages are sent to the right directory
-# This directory must be writable by the puppet user
-logdir=/var/log/puppet
-rundir=/var/run