From: Markus Strauss <Markus@ITstrauss.eu>
Date: Tue, 1 Nov 2011 15:54:12 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/mstrauss/puppet-runit
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4725e08f1872d914c258ef0159389c76dba97f31;p=puppet-runit.git

Merge branch 'master' of https://github.com/mstrauss/puppet-runit

Conflicts:
	manifests/service.pp
---

4725e08f1872d914c258ef0159389c76dba97f31
diff --cc manifests/service.pp
index 54b10ad,4f886cf..85a7ec5
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@@ -14,9 -18,16 +18,17 @@@ define runit::service 
    # logging stuff
    $logger  = true,       # shall we setup an logging service;  if you use 'command' before, 
                           # all output from command will be logged automatically to $logdir/current
-   $logdir  = "${rundir}/log",
 -  $_logdir  = undef
++  $_logdir  = undef,
 +  $timeout = 7           # service restart/stop timeouts (only relevant for 'enabled' services)
  ) {
+   
+   # using the following construct, because '$logdir = "${rundir}/log"' in the
+   # define statement produces compilation warnings  
+   if $_logdir == undef {
+     $logdir = "${rundir}/log"
+   } else {
+     $logdir = $_logdir
+   }
  
    # FixMe: Validate parameters
    # fail("Only one of 'command', 'content', or 'source' parameters is allowed")
@@@ -57,12 -67,25 +69,21 @@@
        ensure  => $ensure,
        mode    => 755,
        ;
+     "${svbase}/finish":
+       content => $finish_content ? {
+         undef   => template('runit/finish.erb'),
+         default => $finish_content,
+       },
+       source  => $finish_source,
+       ensure  => $ensure,
+       mode    => 755,
+       ;
    }
- 
+   
 -  # eventually enabling the service
 -  if $ensure == present and $enable == true {
 -    $_ensure_enabled = present
 -  } else {
 -    $_ensure_enabled = absent
 +  # eventually enabling/disabling the service
 +  if $enable == true {
 +    debug( "Service ${name}: ${_ensure_enabled}" )
 +    runit::service::enabled { $name: ensure => $ensure, timeout => $timeout }
    }
  
 -  debug( "Service ${name}: ${_ensure_enabled}" )
 -
 -  runit::service::enabled { $name: ensure => $_ensure_enabled }
  }