diff --git a/debian/README.source b/debian/README.source index 49b373b40..fd9155241 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,9 +1,2 @@ -The debian/ directory for this package is maintained in bzr. There are two -primary branches, kept by each maintainer: - -http://www.hezmatt.org/~mpalmer/bzr/puppet.debian (mpalmer) -http://repo.spacepants.org/puppet/puppet.debian (jaq) - -Typically all the changes will be in one (or both) of these branches. They -merge from each other on a regular basis, and the canonical version for a -release just depends on who actually made the upload. +The debian directory is now maintained on Alioth in git. +See http://pkg-puppet.alioth.debian.org/ for more information. diff --git a/debian/changelog b/debian/changelog index 1a33e55c3..69984d622 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,146 +1,257 @@ +puppet (0.24.1-2) unstable; urgency=low + + * Set rundir correctly (Closes: #460203, #459579) + * Apply patch for puppet#1003 to enable collection of tagged resources + + -- Thom May Wed, 16 Jan 2008 11:08:55 +0100 + +puppet (0.24.1-1) unstable; urgency=low + + * New upstream release (Closes: #445626) + * Set maintainer to pkg-puppet-devel + + -- Thom May Sun, 30 Dec 2007 19:13:47 +0100 + +puppet (0.24.0-1) unstable; urgency=low + + * New upstream release + + -- Thom May Wed, 19 Dec 2007 16:00:34 +0100 + +puppet (0.23.2-15) unstable; urgency=low + + * No change upload setting maintainer to me whilst waiting for an alioth + project. + + -- Thom May Thu, 29 Nov 2007 10:44:50 +0100 + +puppet (0.23.2-14) unstable; urgency=low + + * Orphaning. + * Create /var/lib/puppet in the puppet package. Closes: #452506. + * Start the puppet init script after puppetmaster, to silence whiny bug + reports. Closes: #452064. + * Add a reload command to the Puppet init script. Closes: #452060. + + -- Matthew Palmer Thu, 29 Nov 2007 10:48:21 +1100 + +puppet (0.23.2-13) unstable; urgency=low + + * Drop quotes from an already-quoted value in a query. Closes: #448179. + * Remove excessive quoting from puppet/network/handler/master.rb. + Closes: #448221. + * Force removal of directories during pluginsync. Closes: #448180. + + -- Matthew Palmer Tue, 30 Oct 2007 14:55:19 +1100 + +puppet (0.23.2-12) unstable; urgency=low + + * Create /var/run/puppet and set the perms in the various initscripts, as + well as hardcoding the rundir better in configuration.rb and removing + the explicit rundir setting from puppet.conf. Closes: #447314. + * Apply additional patch given (backwards) to fix export/collect on some + database backends. Closes: #445591 (again!) + + -- Matthew Palmer Sat, 20 Oct 2007 11:28:50 +1000 + +puppet (0.23.2-11) unstable; urgency=low + + * Apply patch from puppet#786 to fix a problem with exported resources not + being properly detected as needing a rerun. Closes: #445591. + * Fix ignore handling for the plugins mount. Closes: #446390. + + -- Matthew Palmer Mon, 15 Oct 2007 09:11:25 +1000 + +puppet (0.23.2-10) unstable; urgency=low + + * Recycle connections when we change (or get) certs. + * Catch and retry more transient errors in the XMLRPC wrapper. + + -- Matthew Palmer Thu, 27 Sep 2007 15:06:11 +1000 + +puppet (0.23.2-9) unstable; urgency=low + + * Recycle the HTTP connection if we get an EPIPE during a request. + Closes: #444177. Thanks to Jos Backus for helping with testing. + + -- Matthew Palmer Thu, 27 Sep 2007 09:55:34 +1000 + +puppet (0.23.2-8) unstable; urgency=low + + * Remove extraneous debugging output accidentally left behind in the last + release. + * Fix spelling mistakes in debian/control and debian/puppet.preinst. + Closes: #444158. + + -- Matthew Palmer Thu, 27 Sep 2007 07:45:07 +1000 + +puppet (0.23.2-7) unstable; urgency=low + + * Ignore ENOENT errors in the module plugin syncing code, since they're + innocuous and expected. + * Allow facts that are downloaded through pluginsync to be used like any + other fact. + * Allow users to still have an old-style plugins mount if they want, by + specifying a path for the mount. Also track down a fault in old-style + fileserving which did strange slash-stripping. Closes: #443932. + + -- Matthew Palmer Tue, 25 Sep 2007 16:41:32 +1000 + +puppet (0.23.2-6) unstable; urgency=low + + * Patch rails/param_name.rb to stop query failures, as per puppet#784. + * Actually honour namevar. + * Only set dbuser if explicitly asked for. + * Fix annoying database deletion error for ParamValue objects. + * Add an accessor for ca_file, since older openssl-ruby only had a writer. + * Fix the fileserver to honour ignore. Thanks to Nathan Ward for the + bug report on IRC. + + -- Matthew Palmer Thu, 20 Sep 2007 16:10:41 +1000 + puppet (0.23.2-5) unstable; urgency=low * Add some NEWS for the ssldir transition. Should have done that earlier. * Remove the explicit mode change for vardir, and fix up the mode on statedir, as well. Closes: #425496. * Only set some database parameters if they're explicitly set; this makes life easier for PgSQL ident auth. * Allow empty config options. -- Matthew Palmer Thu, 13 Sep 2007 11:09:59 +1000 puppet (0.23.2-4) unstable; urgency=low * Fix puppet#776 in a slightly better way by only flushing the cache when a value is changed, rather than whenever a value is read. * Apply patch from puppet#755 to cache connections to the Puppetmaster, which improves performance by more than a little. * Modify the fileserver so that it provides a 'plugins' mount which exports the union of the plugins directory of all modules. -- Matthew Palmer Fri, 31 Aug 2007 15:32:04 +1000 puppet (0.23.2-3) unstable; urgency=low * Clear the config value cache every time. This is a titchy little performance hit, but it works around puppet#776 rather nicely. -- Matthew Palmer Fri, 24 Aug 2007 16:08:04 +1000 puppet (0.23.2-2) unstable; urgency=low * Move the SSL state directory to a more policy-friendly location, /var/lib/puppet/ssl. -- Matthew Palmer Tue, 21 Aug 2007 12:54:40 +1000 puppet (0.23.2-1) unstable; urgency=low * New upstream release. -- Matthew Palmer Tue, 7 Aug 2007 12:47:49 +1000 puppet (0.23.1-1) unstable; urgency=low * New upstream release. * Switch primary maintainer to me. Thanks jaq. * Make the recommendation for rails >= 1.2.3-2, to avoid incompatibilities. This breaks compatibility with stable, but the rails package from unstable should install cleanly in stable. Closes: #433999 -- Matthew Palmer Sat, 21 Jul 2007 16:34:36 +1000 puppet (0.23.0-1) unstable; urgency=low * New upstream release. - Includes a new configuration file handling system; see NEWS.Debian. -- Matthew Palmer Mon, 25 Jun 2007 09:55:12 +1000 puppet (0.22.4-2) unstable; urgency=low * Depend on libshadow-ruby1.8, for new password modification functionality added to upstream 0.22.4. * Several improvements from Micah Anderson: - Better vim syntax installation process. - Install Emacs syntax highlighting. - Install logcheck rules. Closes: #421851. -- Matthew Palmer Thu, 3 May 2007 15:04:15 +1000 puppet (0.22.4-1) unstable; urgency=low * New upstream release. -- Matthew Palmer Wed, 2 May 2007 12:20:15 +1000 puppet (0.22.3-1) unstable; urgency=low * New upstream release. Closes: #415773. * Switch to using our own logrotate config, and enhance it as per David Schmitt's suggestions. Closes: #414282. * Add puppetrun to the puppetmaster package, and actually put puppetdoc into the puppet package. Closes: #419273. * Copy vim syntax highlighting file into the puppet package, and add a stanza to have Vim automatically highlight .pp files. Closes: #412868. Thanks to David Schmitt for researching how to do all of that. * Add a templatedir setting to the default puppetmasterd.conf to make it obvious that it can be changed. Closes: #407506. -- Matthew Palmer Wed, 18 Apr 2007 14:03:33 +1000 puppet (0.22.1-1) unstable; urgency=low * New upstream release. -- Matthew Palmer Fri, 2 Feb 2007 09:06:46 +1100 puppet (0.22.0-1) unstable; urgency=low * New upstream release. * Use --startas instead of --init in init scripts, which (according to Paul Hampson) makes checking for already-running instances work. Closes: #405912. -- Matthew Palmer Mon, 8 Jan 2007 08:41:35 +1100 puppet (0.20.1-1) unstable; urgency=low * New upstream release. (Closes: #387674) * Rationalise the puppetmasterd init script. * Add inclusion of /etc/default files for init scripts. (Closes: #388178) * Add puppet.conf to match puppetd.conf. (Closes: #385646) -- Matthew Palmer Thu, 30 Nov 2006 10:54:19 +1100 puppet (0.18.4-1) unstable; urgency=low * New upstream release. - Properly detect all services, including those in rcS.d. (Closes: #378351) * Add Homepage: to the long description. (Closes: #377896) -- Matthew Palmer Mon, 24 Jul 2006 19:46:06 +1000 puppet (0.18.3-1) unstable; urgency=low * New upstream version. - Set DEBIAN_FRONTEND=noninteractive when installing Debian packages. (Closes: #378338) -- Matthew Palmer Sun, 16 Jul 2006 10:58:50 +1000 puppet (0.18.1-1) unstable; urgency=low * Make Puppet not wait for a cert at all (to prevent startup hangs). * Cleanup the init scripts to not have NO_START detritus. * Apply puppet.debian-frontend, to set DEBIAN_FRONTEND=noninteractive on package installation. -- Matthew Palmer Tue, 27 Jun 2006 15:05:32 +1000 puppet (0.18.0-1) unstable; urgency=low * Initial release. (Closes: #348625) -- Matthew Palmer Wed, 24 May 2006 13:10:01 +1000 diff --git a/debian/control b/debian/control index 879c9770c..8b0e92e7e 100644 --- a/debian/control +++ b/debian/control @@ -1,45 +1,45 @@ Source: puppet Section: admin Priority: optional -Maintainer: Matthew Palmer -Uploaders: Jamie Wilkinson , Matthew Palmer +Maintainer: Puppet Package Maintainers +Uploaders: Thom May Build-Depends-Indep: debhelper (>= 4.0.0), ruby (>= 1.8.1) Standards-Version: 3.6.2 Package: puppet Architecture: all Depends: ruby (>= 1.8.1), libxmlrpc-ruby, libopenssl-ruby, libshadow-ruby1.8, adduser, facter, lsb-base Recommends: rdoc Description: centralised configuration management for networks 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. . Puppet's simple declarative specification language provides powerful classing abilities for drawing out the similarities between hosts while allowing them to be as specific as necessary, and it handles dependency and prerequisite relationships between objects clearly and explicitly. . Homepage: http://reductivelabs.com/projects/puppet Package: puppetmaster Architecture: all Depends: ruby (>= 1.8.1), puppet (= ${Source-Version}), facter, lsb-base Recommends: rails (>= 1.2.3-2), rdoc Description: centralised configuration management control daemon 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. . Puppet's simple declarative specification language provides powerful classing abilities for drawing out the similarities between hosts while allowing them to be as specific as necessary, and it handles dependency and prerequisite relationships between objects clearly and explicitly. . This package contains the manifest server, 'puppetmaster'. . Homepage: http://reductivelabs.com/projects/puppet diff --git a/debian/puppet.conf b/debian/puppet.conf index e17d039bb..c541c748a 100644 --- a/debian/puppet.conf +++ b/debian/puppet.conf @@ -1,7 +1,8 @@ [main] logdir=/var/log/puppet vardir=/var/lib/puppet ssldir=/var/lib/puppet/ssl +rundir=/var/run/puppet [puppetmasterd] templatedir=/var/lib/puppet/templates diff --git a/debian/puppet.dirs b/debian/puppet.dirs index 95ccc1e1b..9ce18f88e 100644 --- a/debian/puppet.dirs +++ b/debian/puppet.dirs @@ -1,6 +1,7 @@ usr/sbin usr/lib/ruby/1.8 var/log/puppet etc/puppet/files usr/share/vim/addons/ftdetect -usr/share/vim/vim70/syntax +usr/share/vim/vim71/syntax +var/lib/puppet diff --git a/debian/puppet.init b/debian/puppet.init index da9f548cb..063f9273f 100644 --- a/debian/puppet.init +++ b/debian/puppet.init @@ -1,55 +1,64 @@ #! /bin/sh PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/puppetd DAEMON_OPTS="-w 0" NAME=puppetd DESC="puppet configuration management tool" test -x $DAEMON || exit 0 [ -r /etc/default/puppet ] && . /etc/default/puppet . /lib/lsb/init-functions +reload_puppet() { + start-stop-daemon --stop --quiet --signal HUP --pidfile /var/run/puppet/$NAME.pid +} + start_puppet() { start-stop-daemon --start --quiet --pidfile /var/run/puppet/$NAME.pid \ --startas $DAEMON -- $DAEMON_OPTS } stop_puppet() { start-stop-daemon --stop --quiet --pidfile /var/run/puppet/$NAME.pid } if [ ! -d /var/run/puppet ]; then rm -rf /var/run/puppet mkdir -p /var/run/puppet fi chown puppet:puppet /var/run/puppet case "$1" in start) log_begin_msg "Starting $DESC" start_puppet log_end_msg 0 ;; stop) log_begin_msg "Stopping $DESC" stop_puppet log_end_msg 0 ;; - restart|force-reload) + reload) + log_begin_msg "Reloading $DESC" + reload_puppet + log_end_msg 0 + ;; + restart|force-reload) log_begin_msg "Restarting $DESC" stop_puppet sleep 1 start_puppet log_end_msg 0 ;; *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + echo "Usage: $0 {start|stop|restart|force-reload|reload}" >&2 exit 1 ;; esac exit 0 diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 index 69bf3a4af..ecabcbad0 --- a/debian/rules +++ b/debian/rules @@ -1,114 +1,115 @@ #!/usr/bin/make -f # -*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 INSTALL=install -Dp prefix := $(CURDIR)/debian/tmp bindir := $(prefix)/usr/bin sbindir := $(prefix)/usr/sbin libdir := $(prefix)/usr/lib localstatedir := $(prefix)/var rubylibdir := $(libdir)/ruby/1.8 sysconfdir := $(prefix)/etc pkgconfdir := $(sysconfdir)/puppet ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif configure: configure-stamp configure-stamp: dh_testdir touch configure-stamp build: build-stamp build-stamp: configure-stamp dh_testdir touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs # ripped from the redhat spec # this sucks, who wants to maintain this? # note to self, fix the install.rb to handle DESTDIR and change # library path install -d -m0755 $(sbindir) install -d -m0755 $(bindir) install -d -m0755 $(rubylibdir) install -d -m0755 $(pkgconfdir)/manifests install -d -m0755 $(localstatedir)/lib/puppet install -d -m0755 $(localstatedir)/run install -d -m0755 $(localstatedir)/log/puppet $(INSTALL) -m0755 bin/puppet bin/puppetdoc $(bindir) $(INSTALL) -m0755 bin/puppetd bin/puppetmasterd bin/puppetca bin/puppetrun $(sbindir) $(INSTALL) -m0644 lib/puppet.rb $(rubylibdir)/puppet.rb cp -a lib/puppet $(rubylibdir) find $(rubylibdir) -type f -perm +ugo+x -exec chmod a-x {} \; $(INSTALL) -m0644 debian/fileserver.conf $(pkgconfdir)/fileserver.conf $(INSTALL) -m0644 debian/puppet.conf $(pkgconfdir)/puppet.conf # Vim auto-syntax-highlighting stuff - $(INSTALL) -m0644 ext/vim/puppet.vim \ - $(CURDIR)/debian/puppet/usr/share/vim/vim70/syntax/puppet.vim - $(INSTALL) -m0644 ext/vim/filetype.vim \ - $(CURDIR)/debian/puppet/usr/share/vim/addons/ftdetect/puppet.vim + $(INSTALL) -m0644 ext/vim/syntax/puppet.vim \ + $(CURDIR)/debian/puppet/usr/share/vim/vim71/syntax/ + $(INSTALL) -m0644 ext/vim/ftdetect/puppet.vim \ + $(CURDIR)/debian/puppet/usr/share/vim/addons/ftdetect/ # Emacs keeping up with the Joneses $(INSTALL) -m0644 ext/emacs/puppet-mode-init.el \ $(CURDIR)/debian/puppet/etc/emacs/site-start.d/50puppet-mode-init.el $(INSTALL) -m0644 ext/emacs/puppet-mode.el \ $(CURDIR)/debian/puppet/usr/share/emacs/site-lisp/puppet-mode.el dh_installexamples examples/* # Logcheck rules. Gee I wish you could specify a file to source # in dh_installlogcheck. cp ext/logcheck/puppet debian/puppet.logcheck.ignore.server cp ext/logcheck/puppet debian/puppet.logcheck.ignore.workstation dh_installlogcheck rm debian/puppet.logcheck.* # Clean out any SVN cruft that may still be lingering in our # packages find debian/tmp debian/puppet debian/puppetmaster -name .svn |xargs rm -rf # Build architecture-dependent files here. binary-arch: build install # Build architecture-independent files here. binary-indep: build install dh_testdir dh_testroot dh_movefiles -i dh_installchangelogs -i CHANGELOG dh_installdocs -i - dh_installinit -i + dh_installinit -ppuppetmaster + dh_installinit -ppuppet -- defaults 21 dh_installlogrotate -i dh_compress -i dh_fixperms -i dh_installdeb -i dh_shlibdeps -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure