1 files changed, 10 insertions, 37 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index d44d4a2..11078aa 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -2,43 +2,16 @@
 # Copyright (C) 2007 admin@immerda.ch
 # GPLv3
 
-
 class lighttpd {
-    case $operatingsystem {
-        default: { include lighttpd::base }
-    }
-}
-
-class lighttpd::base {
-    package{'lighttpd':
-        ensure => installed,
-    }
-
-    service{lighttpd:
-        ensure => running,
-        enable => true,
-        hasstatus => true, 
-        require => Package[lighttpd],
-    }
+  case $operatingsystem {
+    default: { include lighttpd::base }
+  }
 
-    file{'/etc/lighttpd/lighttpd.conf':
-        source => [ "puppet://$server/files/lighttpd/${fqdn}/lighttpd.conf",
-                    "puppet://$server/files/lighttpd/lighttpd.conf",
-                    "puppet://$server/lighttpd/lighttpd.conf" ],
-        require => Package['lighttpd'],
-        notify => Service['lighttpd'],
-        owner => root, group => 0, mode => 0644;
-    }
-
-    # ToDo: put that in a common module to share with apache
-    file { 'default_lighttpd_index':
-        path => '/var/www/lighttpd/index.html',
-        ensure => file,
-        content => template('lighttpd/default/default_index.erb'),
-        owner => root, group => 0, mode => 0644;
-    }
-
-    if $use_munin {
-        include lighttpd::munin
-    }
+  if $use_shorewall {
+    include shorewall::rules::http
+  }
+  if $use_munin {
+    include lighttpd::munin
+  }
 }
+