diff --git a/lighttpd.conf b/lighttpd.conf
index 207c94c..2590f48 100644
--- a/lighttpd.conf
+++ b/lighttpd.conf
@@ -16,11 +16,11 @@ var.statedir = "/var/lib/lighttpd"
 server.modules = (
 #    "mod_rewrite",
 #    "mod_redirect",
-#    "mod_alias",
+    "mod_alias",
     "mod_access",
 #    "mod_auth",
 #    "mod_status",
-#    "mod_setenv",
+    "mod_setenv",
 #    "mod_proxy",
 #    "mod_simple_vhost",
 #    "mod_evhost",
@@ -49,7 +49,6 @@ server.username      = "lighttpd"
 server.groupname     = "lighttpd"
 
 server.document-root = var.basedir + "/htdocs"
-server.pid-file      = "/run/lighttpd.pid"
 
 #server.errorlog      = var.logdir  + "/error.log"
 # log errors to syslog instead
@@ -295,15 +294,20 @@ url.access-deny = ("~", ".inc")
 # }}}
 
 # Nagios
-alias.url = (
-    "/cgi-bin/nagios" => "/usr/lib/nagios/cgi-bin",
-    "/nagios/cgi-bin" => "/usr/lib/nagios/cgi-bin",
-    "/nagios" => "/usr/share/nagios/htdocs",
-    "/pnp4nagios" => "/usr/share/nagios/htdocs"
-)
+$HTTP["url"] =~ "^/nagios" {
+    alias.url = (
+        "/nagios/cgi-bin" => "/usr/lib/nagios/cgi-bin",
+        "/nagios" => "/usr/share/nagios/htdocs"
+    )
 
-$HTTP["url"] =~ "^/nagios/cgi-bin" {
-    cgi.assign = ( "" => "" )
+    $HTTP["url"] =~ "^/nagios/cgi-bin" {
+        cgi.assign = ( "" => "" )
+    }
+
+    setenv.set-environment = (
+        "AUTH_USER" => "nagiosadmin",
+	"REMOTE_USER" => "nagiosadmin"
+    )
 }
 
 # vim: set ft=conf foldmethod=marker et :