puppet 0.24.9 → 0.25.0

data/conf/osx/createpackage.sh

@@ -7,13 +7,13 @@
 # Last Updated: 2008-07-31
 #
 # Copyright 2008 Google Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,6 +23,7 @@
 
 INSTALLRB="install.rb"
 BINDIR="/usr/bin"
+SBINDIR="/usr/sbin"
 SITELIBDIR="/usr/lib/ruby/site_ruby/1.8"
 PACKAGEMAKER="/Developer/usr/bin/packagemaker"
 PROTO_PLIST="PackageInfo.plist"
@@ -30,7 +31,7 @@ PREFLIGHT="preflight"
 
 
 function find_installer() {
-  # we walk up three directories to make this executable from the root, 
+  # we walk up three directories to make this executable from the root,
   # root/conf or root/conf/osx
   if [ -f "./${INSTALLRB}" ]; then
     installer="$(pwd)/${INSTALLRB}"
@@ -49,7 +50,7 @@ function find_puppet_root() {
 
 function install_puppet() {
   echo "Installing Puppet to ${pkgroot}"
-  "${installer}" --destdir="${pkgroot}" --bindir="${BINDIR}" --sitelibdir="${SITELIBDIR}"
+  "${installer}" --destdir="${pkgroot}" --bindir="${BINDIR}" --sbindir="${SBINDIR}" --sitelibdir="${SITELIBDIR}"
   chown -R root:admin "${pkgroot}"
 }
 
@@ -63,7 +64,7 @@ function prepare_package() {
   # to look at for package creation and substitue the version strings out.
   # Major/Minor versions can only be integers, so we have "0" and "245" for
   # puppet version 0.24.5
-  # Note too that for 10.5 compatibility this Info.plist *must* be set to 
+  # Note too that for 10.5 compatibility this Info.plist *must* be set to
   # follow symlinks.
   VER1=$(echo ${puppet_version} | awk -F "." '{print $1}')
   VER2=$(echo ${puppet_version} | awk -F "." '{print $2}')
@@ -74,15 +75,19 @@ function prepare_package() {
   sed -i '' "s/{SHORTVERSION}/${puppet_version}/g" "${pkgtemp}/${PROTO_PLIST}"
   sed -i '' "s/{MAJORVERSION}/${major_version}/g" "${pkgtemp}/${PROTO_PLIST}"
   sed -i '' "s/{MINORVERSION}/${minor_version}/g" "${pkgtemp}/${PROTO_PLIST}"
-  
+
   # We need to create a preflight script to remove traces of previous
   # puppet installs due to limitations in Apple's pkg format.
   mkdir "${pkgtemp}/scripts"
   cp "${puppet_root}/conf/osx/${PREFLIGHT}" "${pkgtemp}/scripts"
-  
+
   # substitute in the sitelibdir specified above on the assumption that this
   # is where any previous puppet install exists that should be cleaned out.
   sed -i '' "s|{SITELIBDIR}|${SITELIBDIR}|g" "${pkgtemp}/scripts/${PREFLIGHT}"
+  # substitute in the bindir sepcified on the assumption that this is where
+  # any old executables that have moved from bindir->sbindir should be
+  # cleaned out from.
+  sed -i '' "s|{BINDIR}|${BINDIR}|g" "${pkgtemp}/scripts/${PREFLIGHT}"
   chmod 0755 "${pkgtemp}/scripts/${PREFLIGHT}"
 }
 
@@ -123,44 +128,44 @@ function main() {
   fi
 
   find_installer
-  
+
   if [ ! "${installer}" ]; then
     echo "Unable to find ${INSTALLRB}"
     cleanup_and_exit 1
   fi
 
   find_puppet_root
-  
+
   if [ ! "${puppet_root}" ]; then
     echo "Unable to find puppet repository root."
     cleanup_and_exit 1
   fi
-  
+
   pkgroot=$(mktemp -d -t puppetpkg)
-  
+
   if [ ! "${pkgroot}" ]; then
     echo "Unable to create temporary package root."
     cleanup_and_exit 1
   fi
-  
+
   pkgtemp=$(mktemp -d -t puppettmp)
-  
+
   if [ ! "${pkgtemp}" ]; then
     echo "Unable to create temporary package root."
     cleanup_and_exit 1
   fi
-  
+
   install_puppet
   get_puppet_version
-  
+
   if [ ! "${puppet_version}" ]; then
     echo "Unable to retrieve puppet version"
     cleanup_and_exit 1
   fi
-  
+
   prepare_package
   create_package
-  
+
   cleanup_and_exit 0
 }
 

data/conf/osx/preflight

@@ -10,3 +10,11 @@
 
 /bin/rm -Rf "${3}{SITELIBDIR}/puppet"
 /bin/rm -Rf "${3}{SITELIBDIR}/puppet.rb"
+
+# In puppet 0.24.x these executables lived in bindir, but in 0.25.x they
+# have been moved to sbindir. This cleans out old ones before installing.
+/bin/rm -Rf "${3}{BINDIR}/puppetca"
+/bin/rm -Rf "${3}{BINDIR}/puppetd"
+/bin/rm -Rf "${3}{BINDIR}/puppetmasterd"
+/bin/rm -Rf "${3}{BINDIR}/puppetqd"
+/bin/rm -Rf "${3}{BINDIR}/puppetrun"

data/conf/puppet-queue.conf

@@ -0,0 +1,10 @@
+:daemon: true
+:working_dir: /tmp/stompserver
+:storage: .queue
+:queue: file
+:auth: false
+:debug: false
+:group:
+:user:
+:host: 127.0.0.1
+:port: 61613

data/conf/redhat/client.init

@@ -33,28 +33,28 @@ PUPPET_OPTS=""
 ##[ -n "$INIT_VERSION" ] && PUPPET_OPTS="${PUPPET_OPTS} --fullrun"
 
 start() {
-	echo -n $"Starting puppet: "
-        daemon $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}
-	RETVAL=$?
-	echo
+    echo -n $"Starting puppet: "
+    daemon $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}
+    RETVAL=$?
+    echo
         [ $RETVAL = 0 ] && touch ${lockfile}
         return $RETVAL
 }
 
 stop() {
-	echo -n $"Stopping puppet: "
-        killproc $puppetd
-	RETVAL=$?
-	echo
-	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+    echo -n $"Stopping puppet: "
+    killproc $puppetd
+    RETVAL=$?
+    echo
+    [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
 }
 
 reload() {
-	echo -n $"Restarting puppet: "
-        killproc $puppetd -HUP
-	RETVAL=$?
-	echo
-	return $RETVAL
+    echo -n $"Restarting puppet: "
+    killproc $puppetd -HUP
+    RETVAL=$?
+    echo
+    return $RETVAL
 }
 
 restart() {
@@ -62,41 +62,52 @@ restart() {
     start
 }
 
+rh_status() {
+    status | grep -q -- '-p' 2>/dev/null && statusopts="-p $pidfile"
+    status $statusopts $puppetd
+    RETVAL=$?
+    return $RETVAL
+}
+
+rh_status_q() {
+    rh_status >/dev/null 2>&1
+}
+
 genconfig() {
-  echo -n $"Generate configuration puppet: "
-  $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
+    echo -n $"Generate configuration puppet: "
+    $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
 }
 
 case "$1" in
-  start)
-	start
-	;;
-  stop) 
-	stop
-	;;
-  restart)
-	restart
-	;;
-  reload|force-reload)
+    start)
+        start
+    ;;
+    stop)
+        stop
+    ;;
+    restart)
+        restart
+    ;;
+    reload|force-reload)
         reload
-	;;
-  condrestart|try-restart)
-	[ -f "$pidfile" ] && restart
-	;;
-  status)
-        status -p "$pidfile" $puppetd
-        RETVAL=$?
-	;;
-  once)
+    ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+    ;;
+    status)
+        rh_status
+    ;;
+    once)
         shift
         $puppetd -o ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} $@
         ;;
-  genconfig)
-	genconfig
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}"
-	exit 1
+    genconfig)
+        genconfig
+    ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}"
+        exit 1
 esac
 
 exit $RETVAL

data/conf/redhat/logrotate

@@ -1,6 +1,7 @@
 /var/log/puppet/*log {
   missingok
   create 0644 puppet puppet
+  sharedscripts
   postrotate
     [ -e /etc/init.d/puppetmaster ] && /etc/init.d/puppetmaster condrestart >/dev/null 2>&1 || true
     [ -e /etc/init.d/puppet ] && /etc/init.d/puppet reload > /dev/null 2>&1 || true

data/conf/redhat/puppet.spec

@@ -1,17 +1,22 @@
+# Augeas and SELinux requirements may be disabled at build time by passing
+# --without augeas and/or --without selinux to rpmbuild or mock
+
 %{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 %define confdir conf/redhat
 
 Name:           puppet
-Version:        0.24.7
-Release:        3%{?dist}
+Version:        0.25.0
+Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
 URL:            http://puppet.reductivelabs.com/
-Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
+Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tar.gz
+Patch0:         rundir-perms.patch
 Group:          System Environment/Base
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  facter >= 1.5
 BuildRequires:  ruby >= 1.8.1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -20,14 +25,19 @@ Requires:       ruby(abi) = 1.8
 Requires:       ruby-shadow
 %endif
 
-# Pull in libselinux-ruby where it is available
-%if 0%{?fedora} >=9
-Requires:       libselinux-ruby
+# Pull in ruby selinux bindings where available
+%if 0%{?fedora}
+%if 0%{?fedora} >= 12
+%{!?_without_selinux:Requires: ruby(selinux)}
+%else
+%{!?_without_selinux:Requires: libselinux-ruby}
+%endif
 %endif
 
-Requires:       facter >= 1.1.4
+Requires:       facter >= 1.5
 Requires:       ruby >= 1.8.1
-Requires:       ruby-augeas
+%{!?_without_augeas:Requires: ruby-augeas}
+
 Requires(pre):  shadow-utils
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -55,44 +65,31 @@ The server can also function as a certificate authority and file server.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-for f in bin/* ; do
-  sed -i -e '1c#!/usr/bin/ruby' $f
-done
 # Fix some rpmlint complaints
 for f in mac_dscl.pp mac_dscl_revert.pp \
-         mac_netinfo.pp mac_pkgdmg.pp ; do
+         mac_pkgdmg.pp ; do
   sed -i -e'1d' examples/$f
   chmod a-x examples/$f
 done
 for f in external/nagios.rb network/http_server/mongrel.rb relationship.rb; do
   sed -i -e '1d' lib/puppet/$f
 done
+chmod +x ext/puppetstoredconfigclean.rb
 
 find examples/ -type f -empty | xargs rm
 find examples/ -type f | xargs chmod a-x
 
 %install
 rm -rf %{buildroot}
-install -d -m0755 %{buildroot}%{_sbindir}
-install -d -m0755 %{buildroot}%{_bindir}
-install -d -m0755 %{buildroot}%{ruby_sitelibdir}
+ruby install.rb --destdir=%{buildroot} --quick --no-rdoc
+
 install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
-install -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
-install -d -m0755 %{buildroot}%{_mandir}/man8
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
 install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
-install -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
-install -Dp -m0755 bin/* %{buildroot}%{_sbindir}
-mv %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
-mv %{buildroot}%{_sbindir}/ralsh %{buildroot}%{_bindir}/ralsh
-mv %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket
-mv %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun
-mv %{buildroot}%{_sbindir}/puppetdoc %{buildroot}%{_bindir}/puppetdoc
-install -Dp -m0644 lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb
-cp -a lib/puppet %{buildroot}%{ruby_sitelibdir}
-find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r chmod a-x
+install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet
 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
@@ -100,20 +97,38 @@ install -Dp -m0755 %{confdir}/server.init %{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
 install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
-install -Dp -m0644 man/man8/* %{buildroot}%{_mandir}/man8
+
 # We need something for these ghosted files, otherwise rpmbuild
 # will complain loudly. They won't be included in the binary packages
 touch %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
 touch %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
 touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 
+# Install the ext/ directory to %{_datadir}/%{name}
+install -d %{buildroot}%{_datadir}/%{name}
+cp -a ext/ %{buildroot}%{_datadir}/%{name}
+# emacs and vim bits are installed elsewhere
+rm -rf %{buildroot}%{_datadir}/%{name}/ext/{emacs,vim}
+
+# Install emacs mode files
+emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp
+install -Dp -m0644 ext/emacs/puppet-mode.el $emacsdir/puppet-mode.el
+install -Dp -m0644 ext/emacs/puppet-mode-init.el \
+    $emacsdir/site-start.d/puppet-mode-init.el
+
+# Install vim syntax files
+vimdir=%{buildroot}%{_datadir}/vim/vimfiles
+install -Dp -m0644 ext/vim/ftdetect/puppet.vim $vimdir/ftdetect/puppet.vim
+install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
+
 %files
 %defattr(-, root, root, 0755)
+%doc CHANGELOG COPYING LICENSE README examples
+%exclude %{_bindir}/pi
 %{_bindir}/puppet
 %{_bindir}/ralsh
 %{_bindir}/filebucket
 %{_bindir}/puppetdoc
-%exclude %{_mandir}/man8/pi.8.gz
 %{_sbindir}/puppetd
 %{ruby_sitelibdir}/*
 %{_initrddir}/puppet
@@ -121,13 +136,17 @@ touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
 %config(noreplace) %{_sysconfdir}/puppet/puppet.conf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf
-%doc CHANGELOG COPYING LICENSE README examples
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
+# We don't want to require emacs or vim, so we need to own these dirs
+%{_datadir}/emacs
+%{_datadir}/vim
+%{_datadir}/%{name}
 # 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
 %attr(-, puppet, puppet) %{_localstatedir}/lib/puppet
+%exclude %{_mandir}/man8/pi.8.gz
 %doc %{_mandir}/man8/puppet.8.gz
 %doc %{_mandir}/man8/puppet.conf.8.gz
 %doc %{_mandir}/man8/puppetd.8.gz
@@ -137,7 +156,8 @@ touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 %files server
 %defattr(-, root, root, 0755)
 %{_sbindir}/puppetmasterd
-%{_bindir}/puppetrun
+%{_sbindir}/puppetrun
+%{_sbindir}/puppetqd
 %{_initrddir}/puppetmaster
 %config(noreplace) %{_sysconfdir}/puppet/fileserver.conf
 %dir %{_sysconfdir}/puppet/manifests
@@ -153,14 +173,13 @@ touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 # Fixed uid/gid were assigned in bz 472073 (Fedora), 471918 (RHEL-5),
 # and 471919 (RHEL-4)
 %pre
-getent group puppet >/dev/null || groupadd -r puppet -g 52
-getent passwd puppet >/dev/null || \
+getent group puppet &>/dev/null || groupadd -r puppet -g 52 &>/dev/null
+getent passwd puppet &>/dev/null || \
 useradd -r -u 52 -g puppet -d %{_localstatedir}/lib/puppet -s /sbin/nologin \
-useradd -r -g puppet -d %{_localstatedir}/lib/puppet -s /sbin/nologin \
-    -c "Puppet" puppet || :
+    -c "Puppet" puppet &>/dev/null || :
 # ensure that old setups have the right puppet home dir
 if [ $1 -gt 1 ] ; then
-  usermod -d %{_localstatedir}/lib/puppet puppet || :
+  usermod -d %{_localstatedir}/lib/puppet puppet &>/dev/null || :
 fi
 
 %post
@@ -195,6 +214,25 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Fri Sep 04 2009 Todd Zullinger <tmz@pobox.com> - 0.25.0-1
+- Update to 0.25.0
+- Fix permissions on /var/log/puppet (#495096)
+- Install emacs mode and vim syntax files (#491437)
+- Install ext/ directory in %%{_datadir}/%{name} (/usr/share/puppet)
+
+* Mon May 04 2009 Todd Zullinger <tmz@pobox.com> - 0.25.0-0.1.beta1
+- Update to 0.25.0beta1
+- Make Augeas and SELinux requirements build time options
+
+* Mon Mar 23 2009 Todd Zullinger <tmz@pobox.com> - 0.24.8-1
+- Update to 0.24.8
+- Quiet output from %%pre
+- Use upstream install script
+- Increase required facter version to >= 1.5
+
+* Tue Dec 16 2008 Todd Zullinger <tmz@pobox.com> - 0.24.7-4
+- Remove redundant useradd from %%pre
+
 * Tue Dec 16 2008 Jeroen van Meeuwen <kanarip@kanarip.com> - 0.24.7-3
 - New upstream version
 - Set a static uid and gid (#472073, #471918, #471919)