From 733917db0f57218971171a2f21578ec27976a4b7 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Tue, 31 May 2011 14:56:56 +0000
Subject: [PATCH] Virtuoso: add dirsAllowed option, minor cleanup

svn path=/nixos/trunk/; revision=27336
---
 modules/services/databases/virtuoso.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/services/databases/virtuoso.nix b/modules/services/databases/virtuoso.nix
index a185cc343ac1..413c5db53f15 100644
--- a/modules/services/databases/virtuoso.nix
+++ b/modules/services/databases/virtuoso.nix
@@ -20,7 +20,7 @@ with pkgs.lib;
 
       config = mkOption {
         default = "";
-        description = "Extra options to put into virtuoso configuration file.";
+        description = "Extra options to put into Virtuoso configuration file.";
       };
 
       listenAddress = mkOption {
@@ -32,9 +32,14 @@ with pkgs.lib;
       httpListenAddress = mkOption {
 	default = null;
 	example = "myserver:8080";
-        description = "ip:port or port for virtuoso HTTP server to listen on.";
+        description = "ip:port or port for Virtuoso HTTP server to listen on.";
       };
 
+      dirsAllowed = mkOption {
+	default = null;
+	example = "/www, /home/";
+        description = "A list of directories Virtuoso is allowed to access";
+      };
     };
 
   };
@@ -76,6 +81,7 @@ with pkgs.lib;
       [Parameters]
       ServerPort=${cfg.listenAddress}
       RunAs=${virtuosoUser}
+      ${optionalString (cfg.dirsAllowed != null) "DirsAllowed=${cfg.dirsAllowed}"}
 
       [HTTPServer]
       ${optionalString (cfg.httpListenAddress != null) "ServerPort=${cfg.httpListenAddress}"}