From 9dd0aaaca05026a763333ef15da43f74890a50ad Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Tue, 9 Feb 2010 11:19:01 -0500
Subject: provide initial Debian compatibility for git and git::daemon classes

---
 manifests/base.pp           |  3 ++-
 manifests/centos.pp         |  2 ++
 manifests/daemon.pp         | 28 +++++-----------------------
 manifests/daemon/base.pp    | 30 ++++++++++++++++++++++++++++++
 manifests/daemon/centos.pp  | 19 +++++++++++++++++++
 manifests/daemon/debian.pp  | 11 +++++++++++
 manifests/daemon/disable.pp | 18 ++++++++++++------
 manifests/daemon/vhosts.pp  | 10 ++++++----
 manifests/debian.pp         |  5 +++++
 manifests/init.pp           | 13 +++++++++----
 10 files changed, 101 insertions(+), 38 deletions(-)
 create mode 100644 manifests/centos.pp
 create mode 100644 manifests/daemon/base.pp
 create mode 100644 manifests/daemon/centos.pp
 create mode 100644 manifests/daemon/debian.pp
 create mode 100644 manifests/debian.pp

(limited to 'manifests')

diff --git a/manifests/base.pp b/manifests/base.pp
index 06742a7..ca89aac 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 0d22adf..33c0a26 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -1,32 +1,14 @@
 class git::daemon {
+
     include git
-    package{'git-daemon':
-        ensure => installed,
-        require => Package['git'],
-    }
 
-    file{'/etc/init.d/git-daemon':
-        source => [ "puppet://$server/modules/site-git/init.d/${fqdn}/git-daemon",
-                    "puppet://$server/modules/site-git/init.d/git-daemon",
-                    "puppet://$server/modules/git/init.d/git-daemon" ],
-        require => Package['git-daemon'],
-        owner => root, group => 0, mode => 0755;
-    }
-    file{'/etc/sysconfig/git-daemon':
-        source => [ "puppet://$server/modules/site-git/sysconfig/${fqdn}/git-daemon",
-                    "puppet://$server/modules/site-git/sysconfig/git-daemon",
-                    "puppet://$server/modules/git/sysconfig/git-daemon" ],
-        require => Package['git-daemon'],
-        owner => root, group => 0, mode => 0644;
-    }
-    service{'git-daemon':
-        ensure => running,
-        enable => true,
-        hasstatus => true,
-        require => [ File['/etc/sysconfig/git-daemon'], File['/etc/init.d/git-daemon'] ],
+    case $operatingsystem {
+        debian: { include git::daemon::debian }
+        centos: { include git::daemon::centos }
     }
 
     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..940ae52
--- /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..758c9fe
--- /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 6e01268..fe0c9b0 100644
--- a/manifests/daemon/disable.pp
+++ b/manifests/daemon/disable.pp
@@ -1,23 +1,29 @@
 class git::daemon::disable inherits git::daemon {
-  Package['git-daemon']{
-    ensure => absent,
+
+  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 4250a5e..d627df1 100644
--- a/manifests/daemon/vhosts.pp
+++ b/manifests/daemon/vhosts.pp
@@ -1,7 +1,9 @@
 class git::daemon::vhosts inherits git::daemon {
-    File['/etc/sysconfig/git-daemon']{
-        source => [ "puppet://$server/modules/site-git/sysconfig/${fqdn}/git-daemon.vhosts",
-                    "puppet://$server/modules/site-git/sysconfig/git-daemon.vhosts",
-                    "puppet://$server/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" ],
     }
 }
diff --git a/manifests/debian.pp b/manifests/debian.pp
new file mode 100644
index 0000000..1c17df9
--- /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
+    }
+
 }
-- 
cgit v1.2.3


From a6791ae93b0ff79b41dffab7ee48e63d095c888e Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Tue, 9 Feb 2010 12:01:33 -0500
Subject: fix typos

---
 manifests/base.pp   | 2 +-
 manifests/debian.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests')

diff --git a/manifests/base.pp b/manifests/base.pp
index ca89aac..51140b6 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,6 +1,6 @@
 class git::base {
     package { 'git':
         ensure => present,
-        alias => 'git,
+        alias => 'git',
     }
 }
diff --git a/manifests/debian.pp b/manifests/debian.pp
index 1c17df9..8eaa778 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -1,5 +1,5 @@
 class git::debian inherits git::base {
-    Package['git] {
+    Package['git'] {
         name => 'git-core',
     }
 }
-- 
cgit v1.2.3


From 0c30246a9e4cdeb5ac66c0f473e65932374d01af Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Tue, 9 Feb 2010 15:52:01 -0500
Subject: fix more typos

---
 manifests/daemon/centos.pp  | 4 ++--
 manifests/daemon/debian.pp  | 4 ++--
 manifests/daemon/disable.pp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'manifests')

diff --git a/manifests/daemon/centos.pp b/manifests/daemon/centos.pp
index 940ae52..270685a 100644
--- a/manifests/daemon/centos.pp
+++ b/manifests/daemon/centos.pp
@@ -6,12 +6,12 @@ class git::daemon::centos inherits git::daemon::base {
         alias => 'git-daemon',
     }
     
-    File { 'git-daemon_initscript':
+    File['git-daemon_initscript'] {
         path => '/etc/init.d/git-daemon',
         require +> Package['git-daemon'],
     }
 
-    File { 'git-daemon_config':
+    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
index 758c9fe..006ffc5 100644
--- a/manifests/daemon/debian.pp
+++ b/manifests/daemon/debian.pp
@@ -1,10 +1,10 @@
 class git::daemon::debian inherits git::daemon::base {
     
-    File { 'git-daemon_initscript':
+    File['git-daemon_initscript'] {
         path => '/etc/init.d/git-daemon',
     }
 
-    File { 'git-daemon_config':
+    File['git-daemon_config'] {
         path => '/etc/default/git-daemon',
     }
 
diff --git a/manifests/daemon/disable.pp b/manifests/daemon/disable.pp
index fe0c9b0..b60fcec 100644
--- a/manifests/daemon/disable.pp
+++ b/manifests/daemon/disable.pp
@@ -6,7 +6,7 @@ class git::daemon::disable inherits git::daemon {
     }
   }
 
-  File['git-daemon_initscript']{ 
+  File['git-daemon_initscript'] { 
     ensure => absent,
   }
   
-- 
cgit v1.2.3