updating lighttpd config

diff --git a/files/lighttpd.conf b/files/lighttpd.conf
index 5be063e41ff73263ce29f4813a6bc08cbf4b76ee..d48fc00dc5975f2018512600874fedcf77f2ed40 100644 (file)
--- a/files/lighttpd.conf
+++ b/files/lighttpd.conf
@@ -37,7 +37,7 @@ server.modules              = (
 
 ## a static document-root, for virtual-hosting take look at the
 ## server.virtual-* options
-server.document-root        = "/srv/www/lighttpd/"
+server.document-root        = "/var/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -73,6 +73,7 @@ mimetype.assign             = (
   ".ogg"          =>      "application/ogg",
   ".wav"          =>      "audio/x-wav",
   ".gif"          =>      "image/gif",
+  ".jar"          =>      "application/x-java-archive",
   ".jpg"          =>      "image/jpeg",
   ".jpeg"         =>      "image/jpeg",
   ".png"          =>      "image/png",
@@ -174,6 +175,8 @@ server.pid-file            = "/var/run/lighttpd.pid"
 
 ## virtual directory listings
 #dir-listing.activate       = "enable"
+## select encoding for directory listings
+#dir-listing.encoding        = "utf-8"
 
 ## enable debugging
 #debug.log-request-header   = "enable"
@@ -324,3 +327,7 @@ server.groupname           = "lighttpd"
 #include_shell "echo var.a=1"
 ## the above is same as:
 #var.a=1
+
+## include configuration snippets, usually provided by packages
+include_shell "find /etc/lighttpd/conf.d -maxdepth 1 -name '*.conf' -exec cat {} \;"
+

diff --git a/manifests/init.pp b/manifests/init.pp
index e1a9625923db69ad7196875818f1da99f3a1ef61..987af7d46f0b710cec69f75239da8b70b3ef1226 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -32,7 +32,7 @@ class lighttpd::base {
 
     # ToDo: put that in a common module to share with apache
     file { 'default_lighttpd_index':
-        path => '/srv/www/lighttpd/index.html',
+        path => '/var/www/lighttpd/index.html',
         ensure => file,
         content => template('lighttpd/default/default_index.erb'),
         owner => root, group => 0, mode => 0644;