Merge remote-tracking branch 'lavamind/master'

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

10 files changed, 104 insertions, 80 deletions

diff --git a/manifests/base.pp b/manifests/base.pp
index 06742a7..51140b6 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,5 +1,6 @@
 class git::base {
-    package{'git':
+    package { 'git':
         ensure => present,
+        alias => 'git',
     }
 }
diff --git a/manifests/centos.pp b/manifests/centos.pp
new file mode 100644
index 0000000..9634475
--- /dev/null
+++ b/manifests/centos.pp
@@ -0,0 +1,2 @@
+class git::centos inherits git::base {
+}
diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 01cfec2..33c0a26 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -1,60 +1,14 @@
 class git::daemon {
-  include git
-  package{'git-daemon':
-    ensure => installed,
-    require => Package['git'],
-  }
 
-  xinetd::file{'git':
-    require => Package['git-daemon'],
-  }
-  file{'/etc/init.d/git-daemon':
-    require => Package['git-daemon'],
-    owner => root, group => 0, mode => 0755;
-  }
-  file{'/etc/sysconfig/git-daemon':
-    require => Package['git-daemon'],
-    owner => root, group => 0, mode => 0644;
-  }
-  service{'git-daemon':
-    hasstatus => true,
-  }
-  if $git_daemon == 'service' {
-    Xinetd::File['git']{
-      source => "puppet:///modules/git/xinetd.d/git.disabled"
-    }
-    File['/etc/init.d/git-daemon']{
-    source => [ "puppet:///modules/site-git/init.d/${fqdn}/git-daemon",
-                "puppet:///modules/site-git/init.d/git-daemon",
-                "puppet:///modules/git/init.d/git-daemon" ],
-    }
-    File['/etc/sysconfig/git-daemon']{
-      source => [ "puppet:///modules/site-git/sysconfig/${fqdn}/git-daemon",
-                  "puppet:///modules/site-git/sysconfig/git-daemon",
-                  "puppet:///modules/git/sysconfig/git-daemon" ],
-    }
-    Service['git-daemon']{
-      ensure => running,
-      enable => true,
-      require => [ File['/etc/sysconfig/git-daemon'], File['/etc/init.d/git-daemon'] ],
-    }
-  } else {
-    Xinetd::File['git']{
-      source => [ "puppet:///modules/site-git/xinetd.d/${fqdn}/git",
-                  "puppet:///modules/site-git/xinetd.d/git",
-                  "puppet:///modules/git/xinetd.d/git" ],
-    }
-    Service['git-daemon']{
-      ensure => stopped,
-      enable => false,
-      before => [ File['/etc/sysconfig/git-daemon'], File['/etc/init.d/git-daemon'] ],
+    include git
+
+    case $operatingsystem {
+        debian: { include git::daemon::debian }
+        centos: { include git::daemon::centos }
     }
-    File['/etc/init.d/git-daemon','/etc/sysconfig/git-daemon']{
-      ensure => absent,
+
+    if $use_shorewall {
+      include shorewall::rules::gitdaemon
     }
-  }
 
-  if $use_shorewall {
-    include shorewall::rules::gitdaemon
-  }
 }
diff --git a/manifests/daemon/base.pp b/manifests/daemon/base.pp
new file mode 100644
index 0000000..5dd16d6
--- /dev/null
+++ b/manifests/daemon/base.pp
@@ -0,0 +1,30 @@
+class git::daemon::base {
+
+    file { 'git-daemon_initscript':
+        source => [ "puppet://$server/modules/site-git/init.d/${fqdn}/git-daemon",
+                    "puppet://$server/modules/site-git/init.d/${operatingsystem}/git-daemon",
+                    "puppet://$server/modules/site-git/init.d/git-daemon",
+                    "puppet://$server/modules/git/init.d/${operatingsystem}/git-daemon",
+                    "puppet://$server/modules/git/init.d/git-daemon" ],
+        require => Package['git'],
+        owner => root, group => 0, mode => 0755;
+    }
+    
+    file { 'git-daemon_config':
+        source => [ "puppet://$server/modules/site-git/config/${fqdn}/git-daemon",
+                    "puppet://$server/modules/site-git/config/${operatingsystem}/git-daemon",
+                    "puppet://$server/modules/site-git/config/git-daemon",
+                    "puppet://$server/modules/git/config/${operatingsystem}/git-daemon",
+                    "puppet://$server/modules/git/config/git-daemon" ],
+        require => Package['git'],
+        owner => root, group => 0, mode => 0644;
+    }
+    
+    service { 'git-daemon':
+        ensure => running,
+        enable => true,
+        hasstatus => true,
+        require => [ File['git-daemon_initscript'], File['git-daemon_config'] ],
+    }
+
+}
diff --git a/manifests/daemon/centos.pp b/manifests/daemon/centos.pp
new file mode 100644
index 0000000..270685a
--- /dev/null
+++ b/manifests/daemon/centos.pp
@@ -0,0 +1,19 @@
+class git::daemon::centos inherits git::daemon::base {
+
+    package { 'git-daemon':
+        ensure => installed,
+        require => Package['git'],
+        alias => 'git-daemon',
+    }
+    
+    File['git-daemon_initscript'] {
+        path => '/etc/init.d/git-daemon',
+        require +> Package['git-daemon'],
+    }
+
+    File['git-daemon_config'] {
+        path => '/etc/init.d/git-daemon',
+        require +> Package['git-daemon'],
+    }
+
+}
diff --git a/manifests/daemon/debian.pp b/manifests/daemon/debian.pp
new file mode 100644
index 0000000..006ffc5
--- /dev/null
+++ b/manifests/daemon/debian.pp
@@ -0,0 +1,11 @@
+class git::daemon::debian inherits git::daemon::base {
+    
+    File['git-daemon_initscript'] {
+        path => '/etc/init.d/git-daemon',
+    }
+
+    File['git-daemon_config'] {
+        path => '/etc/default/git-daemon',
+    }
+
+}
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
   }
+
 }
 
diff --git a/manifests/daemon/vhosts.pp b/manifests/daemon/vhosts.pp
index beb33ab..d627df1 100644
--- a/manifests/daemon/vhosts.pp
+++ b/manifests/daemon/vhosts.pp
@@ -1,15 +1,9 @@
 class git::daemon::vhosts inherits git::daemon {
-  if $git_daemon == 'service' {
-    File['/etc/sysconfig/git-daemon']{
-      source => [ "puppet:///modules/site-git/sysconfig/${fqdn}/git-daemon.vhosts",
-                  "puppet:///modules/site-git/sysconfig/git-daemon.vhosts",
-                  "puppet:///modules/git/sysconfig/git-daemon.vhosts" ],
+    File['git-daemon_config']{
+        source => [ "puppet://$server/modules/site-git/config/${fqdn}/git-daemon.vhosts",
+                    "puppet://$server/modules/site-git/config/${operatingsystem}/git-daemon.vhosts",
+                    "puppet://$server/modules/site-git/config/git-daemon.vhosts",
+                    "puppet://$server/modules/git/config/${operatingsystem}/git-daemon.vhosts",
+                    "puppet://$server/modules/git/config/git-daemon.vhosts" ],
     }
-  } else {
-    Xinetd::File['git']{
-      source => [ "puppet:///modules/site-git/xinetd.d/${fqdn}/git.vhosts",
-                  "puppet:///modules/site-git/xinetd.d/git.vhosts",
-                  "puppet:///modules/git/xinetd.d/git.vhosts" ],
-    }
-  }
 }
diff --git a/manifests/debian.pp b/manifests/debian.pp
new file mode 100644
index 0000000..8eaa778
--- /dev/null
+++ b/manifests/debian.pp
@@ -0,0 +1,5 @@
+class git::debian inherits git::base {
+    Package['git'] {
+        name => 'git-core',
+    }
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index 812830c..3afce8d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,9 +12,14 @@
 #
 
 class git {
-  include git::base
 
-  if $use_shorewall {
-    include shorewall::rules::out::git
-  }
+    case $operatingsystem {
+        debian: { include git::debian }
+        centos: { include git::centos }
+    }
+
+    if $use_shorewall {
+        include shorewall::rules::out::git
+    }
+
 }