adjust to new lighttpd module

2 files changed, 4 insertions, 19 deletions

diff --git a/manifests/web/lighttpd.pp b/manifests/web/lighttpd.pp
index 7c233fa..9534c60 100644
--- a/manifests/web/lighttpd.pp
+++ b/manifests/web/lighttpd.pp
@@ -1,10 +1,7 @@
 class git::web::lighttpd {
     include ::lighttpd 
 
-    file{'/etc/lighttpd/conf.d/lighttpd-gitweb.conf':
+    lighttpd::config::file{'lighttpd-gitweb':
         content => 'global { server.modules += ("mod_rewrite", "mod_redirect", "mod_alias", "mod_setenv", "mod_cgi" ) }',
-        require => Package['lighttpd'],
-        notify => Service['lighttpd'],
-        owner => root, group => 0, mode => 0644;
     }
 }
diff --git a/manifests/web/repo/lighttpd.pp b/manifests/web/repo/lighttpd.pp
index f5201e7..111cc5e 100644
--- a/manifests/web/repo/lighttpd.pp
+++ b/manifests/web/repo/lighttpd.pp
@@ -5,20 +5,8 @@ define git::web::repo::lighttpd(
 ){
   if $ensure == 'present' { include git::web::lighttpd }
 
-  file{"/etc/lighttpd/conf.d/${name}.gitweb.conf": }
-  if $ensure == 'present' {
-    File["/etc/lighttpd/conf.d/${name}.gitweb.conf"]{
-     content => template('git/web/lighttpd'),
-     owner => root, group => 0, mode => 0644
-    }
-  } else {
-    File["/etc/lighttpd/conf.d/${name}.gitweb.conf"]{
-      ensure => $ensure,
-    }
-  }
-  if defined(Service['lighttpd']) {
-    File["/etc/lighttpd/conf.d/${name}.gitweb.conf"]{
-      notify => Service['lighttpd'],
-    }
+  lighttpd::vhost::file{$name:
+     ensure => $ensure,
+     content => template('git/web/lighttpd');
   }
 }