don't do web stuff if repo is absent

3 files changed, 23 insertions, 20 deletions

diff --git a/manifests/web.pp b/manifests/web.pp
index efc247f..f82e8d3 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -1,19 +1,19 @@
 class git::web {
-    include git
-    package{'gitweb':
-        ensure => present,
-        require => Package['git'],
-    }
+  include git
+  package{'gitweb':
+    ensure => present,
+    require => Package['git'],
+  }
 
-    file{'/etc/gitweb.d':
-        ensure => directory,
-        owner => root, group => 0, mode => 0755;
-    }
-    file{'/etc/gitweb.conf':
-        source => [ "puppet://$server/modules/site-git/web/${fqdn}/gitweb.conf",
-                    "puppet://$server/modules/site-git/web/gitweb.conf",
-                    "puppet://$server/modules/git/web/gitweb.conf" ],
-        require => Package['gitweb'],
-        owner => root, group => 0, mode => 0644;
-    }
+  file{'/etc/gitweb.d':
+    ensure => directory,
+    owner => root, group => 0, mode => 0755;
+  }
+  file{'/etc/gitweb.conf':
+    source => [ "puppet://$server/modules/site-git/web/${fqdn}/gitweb.conf",
+                "puppet://$server/modules/site-git/web/gitweb.conf",
+                "puppet://$server/modules/git/web/gitweb.conf" ],
+    require => Package['gitweb'],
+    owner => root, group => 0, mode => 0644;
+  }
 }
diff --git a/manifests/web/repo.pp b/manifests/web/repo.pp
index b9a27da..bf02a93 100644
--- a/manifests/web/repo.pp
+++ b/manifests/web/repo.pp
@@ -10,7 +10,7 @@ define git::web::repo(
   if ($ensure == 'present') and (($projects_list == 'absent') or ($projectroot == 'absent')){
     fail("You have to pass \$project_list and \$projectroot for ${name} if it should be present!")
   }
-  include git::web
+  if $ensure == 'present' { include git::web }
   $gitweb_url = $name
   case $gitweb_sitename {
     'absent': { $gitweb_sitename = "${name} git repository" }
diff --git a/manifests/web/repo/lighttpd.pp b/manifests/web/repo/lighttpd.pp
index b6269b1..b7ba9fd 100644
--- a/manifests/web/repo/lighttpd.pp
+++ b/manifests/web/repo/lighttpd.pp
@@ -3,9 +3,12 @@ define git::web::repo::lighttpd(
   $gitweb_url,
   $gitweb_config
 ){
-  include git::web::lighttpd
-  file{"/etc/lighttpd/gitweb.d/${name}.conf":
-     notify => Service['lighttpd'],
+  if $ensure == 'present' { include git::web::lighttpd }
+  file{"/etc/lighttpd/gitweb.d/${name}.conf": }
+  if defined(Service['lighttpd']) {
+    File["/etc/lighttpd/gitweb.d/${name}.conf"]{
+      notify => Service['lighttpd'],
+    }
   }
   if $ensure == 'present' {
     File["/etc/lighttpd/gitweb.d/${name}.conf"]{