Merge remote-tracking branch 'lavamind/master'

Conflicts:
	manifests/daemon.pp
	manifests/daemon/disable.pp
	manifests/daemon/vhosts.pp

1 files changed, 12 insertions, 9 deletions

diff --git a/manifests/daemon/disable.pp b/manifests/daemon/disable.pp
index 807d03e..b60fcec 100644
--- a/manifests/daemon/disable.pp
+++ b/manifests/daemon/disable.pp
@@ -1,26 +1,29 @@
 class git::daemon::disable inherits git::daemon {
-  Package['git-daemon']{
-    ensure => absent,
-  }
 
-  Xinetd::File['git']{
-    source => "puppet:///modules/git/xinetd.d/git.disabled"
+  if defined(Package['git-daemon']) {
+    Package['git-daemon'] {
+        ensure => absent,
+    }
   }
-  File['/etc/init.d/git-daemon']{
+
+  File['git-daemon_initscript'] { 
     ensure => absent,
   }
-  File['/etc/sysconfig/git-daemon']{
+  
+  File['git-daemon_config'] {
     ensure => absent,
   }
-  Service['git-daemon']{
+  
+  Service['git-daemon'] {
     ensure => stopped,
     enable => false,
     require => undef,
-    before => File['/etc/init.d/git-daemon'],
+    before => File['git-daemon_initscript'],
   }
 
   if $use_shorewall {
     include shorewall::rules::gitdaemon::absent
   }
+
 }