diff options
| -rw-r--r-- | debian/README.source | 11 | ||||
| -rw-r--r-- | debian/changelog | 111 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/puppet.conf | 1 | ||||
| -rw-r--r-- | debian/puppet.dirs | 3 | ||||
| -rw-r--r-- | debian/puppet.init | 13 | ||||
| -rwxr-xr-x[-rw-r--r--] | debian/rules | 11 | ||||
| -rw-r--r-- | lib/puppet/parser/interpreter.rb | 6 | ||||
| -rw-r--r-- | lib/puppet/provider/package/pkgdmg.rb | 7 |
9 files changed, 142 insertions, 25 deletions
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,3 +1,114 @@ +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 <thom@debian.org> 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 <thom@debian.org> Sun, 30 Dec 2007 19:13:47 +0100 + +puppet (0.24.0-1) unstable; urgency=low + + * New upstream release + + -- Thom May <thom@debian.org> 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 <thom@debian.org> 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 <mpalmer@debian.org> 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 <mpalmer@debian.org> 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 <mpalmer@debian.org> 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 <mpalmer@debian.org> 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 <mpalmer@debian.org> 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 <mpalmer@debian.org> 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 <mpalmer@debian.org> 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 <mpalmer@debian.org> 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 <mpalmer@debian.org> 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. diff --git a/debian/control b/debian/control index 879c9770c..8b0e92e7e 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,8 @@ Source: puppet Section: admin Priority: optional -Maintainer: Matthew Palmer <mpalmer@debian.org> -Uploaders: Jamie Wilkinson <jaq@debian.org>, Matthew Palmer <mpalmer@debian.org> +Maintainer: Puppet Package Maintainers <pkg-puppet-devel@lists.alioth.debian.org> +Uploaders: Thom May <thom@debian.org> Build-Depends-Indep: debhelper (>= 4.0.0), ruby (>= 1.8.1) Standards-Version: 3.6.2 diff --git a/debian/puppet.conf b/debian/puppet.conf index e17d039bb..c541c748a 100644 --- a/debian/puppet.conf +++ b/debian/puppet.conf @@ -2,6 +2,7 @@ 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 @@ -3,4 +3,5 @@ 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 @@ -12,6 +12,10 @@ test -x $DAEMON || exit 0 . /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 @@ -39,7 +43,12 @@ case "$1" in 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 @@ -47,7 +56,7 @@ case "$1" in 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 diff --git a/debian/rules b/debian/rules index 69bf3a4af..ecabcbad0 100644..100755 --- a/debian/rules +++ b/debian/rules @@ -66,10 +66,10 @@ install: build $(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 \ @@ -100,7 +100,8 @@ binary-indep: build install 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 diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index d4b7449fb..27192af17 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -25,7 +25,11 @@ class Puppet::Parser::Interpreter # evaluate our whole tree def compile(node) raise Puppet::ParseError, "Could not parse configuration; cannot compile" unless env_parser = parser(node.environment) - return Puppet::Parser::Compiler.new(node, env_parser).compile + begin + return Puppet::Parser::Compiler.new(node, env_parser).compile + rescue + raise Puppet::Error, "Could not compile node %s" % node + end end # create our interpreter diff --git a/lib/puppet/provider/package/pkgdmg.rb b/lib/puppet/provider/package/pkgdmg.rb index 2020b6b56..2614d0950 100644 --- a/lib/puppet/provider/package/pkgdmg.rb +++ b/lib/puppet/provider/package/pkgdmg.rb @@ -145,11 +145,8 @@ file system and not via a URL method." begin open(cached_source) do |dmg| xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", dmg.path - ptable = Plist::parse_xml xml_str - # JJM Filter out all mount-paths into a single array, discard the rest. - mounts = ptable['system-entities'].collect { |entity| - entity['mount-point'] - }.select { |mountloc|; mountloc } + # JJM THIS IS A HORRIBLE HACK (Well, actually it's not so bad...) + mounts = xml_str.scan(/<string>(\/tmp.*?)<\/string>/)[0] begin mounts.each do |fspath| Dir.entries(fspath).select { |f| |