From e40da93b493fa3402cd8ddf4c88acb03257da58f Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Sat, 14 Jan 2012 19:26:11 +0000
Subject: clean the gitweb module

---
 modules/gitweb/manifests/init.pp | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'modules')

diff --git a/modules/gitweb/manifests/init.pp b/modules/gitweb/manifests/init.pp
index 03fd901c..8cdc4932 100644
--- a/modules/gitweb/manifests/init.pp
+++ b/modules/gitweb/manifests/init.pp
@@ -1,32 +1,21 @@
 class gitweb {
-    package { 'gitweb':
-        ensure => installed,
-    }
+    package { 'gitweb': }
     # TODO some rpm may be needed ( like perl-FCGI )
     # git >= 17.2 is needed for fastcgi support
 
     # TODO fix git rpm to show the css, the js, and others missing file
 
-    file { 'gitweb.conf':
-        ensure => present,
-        path => '/etc/gitweb.conf',
+    file { '/etc/gitweb.conf':
         content => template('gitweb/gitweb.conf'),
         notify => Service['apache'],
-        require => Package['gitweb']
+        require => Package['gitweb'],
     }
 
-    file { 'webapps.d/gitweb.conf':
-        ensure => present,
-        path => '/etc/httpd/conf/webapps.d/gitweb.conf',
-        content => template('gitweb/webapp.conf'),
-        notify => Service['apache'],
-        require => Package['apache'],
+    apache::webapp_other { 'gitweb':
+        webapp_file => 'gitweb/webapp.conf',
     }
    
-    file { 'gitweb.wrapper.sh':
-        ensure => present,
-        mode => 755,
-        path => '/usr/local/bin/gitweb.wrapper.sh',
+    local_script { 'gitweb.wrapper.sh':
         content => template('gitweb/wrapper.sh'),
         notify => Service['apache'],
     }
-- 
cgit v1.2.1