[Pkg-puppet-devel] d2d679e004fbd73cb7f948828ea7fa947a568dcd

[Micah Anderson]

Hey all,

I few things about the most recent commits I made:

1. I added /etc/defaults files, they are set to how things behave now,
so there shouldn't be any surprises in behavior

2. I added the mongrel options to the puppetmaster initscript, so if you
set that option in /etc/default/puppetmaster and set the number of
mongrel instances, the initscript will handle the starting of the
multiple mongrels

3. I cherry-picked a few commits from upstream that seemed worth
deploying (two of them are issues that were really annoying me, so I
know they will make me happier, and one fixes a lintian error that I
reported). This is the first time I've cherry-picked things, and I think
I accidentally cherry-picked one thing that was then reverted later, so
I cherry-picked the revert too. I think I should have just pulled that
out when I realized it, instead of doing that because that seems
weird. Anyways, be on the lookout for anything odd.

4. Finally, I made changes to the LSB headers in the initscripts. I
removed a long series of white space after all the headers that probably
got put in there from a cut and paste, and was causing update-rc.d to
complain that there wasn't actually a LSB header. Secondly I got an
email from Sam Quigley who pointed out a problem on Ubuntu gutsy which
starts puppet before the network has been fully configured so you get
"no route to host" errors on boot. So I added $network and $named to the
Required-Start and Required-Stop headers for the puppet initscript; and
I put $network in the Should-Start/Should-Stop headers for the
puppetmaster. My reasoning was that the network should be there, but if
its not, puppetmaster will still run fine.

However, I am wondering if maybe the puppet init script should instead
have the Should-Start: $network and Should-Stop: $network, and not make
it a hard requirement (as the Required-Start does), but an advisable
one. I was thinking of the case where I might be with my laptop on the
train, with no internet, but I have a local dev puppetmaster running on
my laptop and a puppetd that queries my puppetmaster on
127.0.0.1... that seems like a legitimate setup and shouldn't be
forbidden (which would be the case if using the Required fields).
                                                                                                                                                             
Any thoughts on this? 

Also -- I was thinking of uploading this version to the archive, but I
thought maybe I'd give others a chance to respond in case anyone else
was thinking of doing anything on the package before the next upload?

Micah

* Micah Anderson <micah at riseup.net> [2008-04-13 21:08-0400]:
>     Adjusted LSB headers in initscripts to be more useful
> 
> diff --git a/debian/changelog b/debian/changelog
> index f921791..798b43a 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -4,6 +4,11 @@ puppet (0.24.4-4) unstable; urgency=low
>    * Modify /etc/init.d/puppetmaster to support mongrel instances
>      on multiple ports
>    * Remove no longer necessary .svn cleaning from debian/rules
> +  * Add $network and $named to Required-Start and Required-Stop 
> +    LSB headers in puppet and puppetmaster initscripts, 
> +    thanks Sam Quigley
> +  * Added Should-Start: $network and Should-Stop: $network in 
> +    puppetmaster initscript
>    * Cherry-pick upstream patches from 0.24.x branch:
>      - Install manpages
>      - Fix shebang issues (#1148)
> diff --git a/debian/puppet.init b/debian/puppet.init
> index 7b65ab5..c18d0bd 100644
> --- a/debian/puppet.init
> +++ b/debian/puppet.init
> @@ -1,8 +1,8 @@
>  #! /bin/sh
>  ### BEGIN INIT INFO
>  # Provides:          puppet                                                                                                                                
> -# Required-Start:    $remote_fs $syslog                                                                                                                    
> -# Required-Stop:     $remote_fs $syslog                                                                                                                    
> +# Required-Start:    $network $named $remote_fs $syslog
> +# Required-Stop:     $network $named $remote_fs $syslog
>  # Should-Start:      puppetmaster                                                                                                                          
>  # Default-Start:     2 3 4 5                                                                                                                               
>  # Default-Stop:      0 1 6                                                                                                                                 
> diff --git a/debian/puppetmaster.init b/debian/puppetmaster.init
> index 02987fa..709e8b1 100644
> --- a/debian/puppetmaster.init
> +++ b/debian/puppetmaster.init
> @@ -1,8 +1,10 @@
>  #! /bin/sh
>  ### BEGIN INIT INFO
>  # Provides:          puppetmaster                                                                                                                          
> -# Required-Start:    $remote_fs $syslog                                                                                                                    
> -# Required-Stop:     $remote_fs $syslog                                                                                                                    
> +# Required-Start:    $named $remote_fs $syslog
> +# Required-Stop:     $named $remote_fs $syslog
> +# Should-Start:      $network
> +# Should-Stop:	     $network
>  # Default-Start:     2 3 4 5                                                                                                                               
>  # Default-Stop:      0 1 6                                                                                                                                 
>  ### END INIT INFO                 
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 307 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-puppet-devel/attachments/20080414/e02943f9/attachment.pgp