Virtuoso: add dirsAllowed option, minor cleanup
svn path=/nixos/trunk/; revision=27336
This commit is contained in:
parent
cfce376628
commit
733917db0f
@ -20,7 +20,7 @@ with pkgs.lib;
|
|||||||
|
|
||||||
config = mkOption {
|
config = mkOption {
|
||||||
default = "";
|
default = "";
|
||||||
description = "Extra options to put into virtuoso configuration file.";
|
description = "Extra options to put into Virtuoso configuration file.";
|
||||||
};
|
};
|
||||||
|
|
||||||
listenAddress = mkOption {
|
listenAddress = mkOption {
|
||||||
@ -32,9 +32,14 @@ with pkgs.lib;
|
|||||||
httpListenAddress = mkOption {
|
httpListenAddress = mkOption {
|
||||||
default = null;
|
default = null;
|
||||||
example = "myserver:8080";
|
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]
|
[Parameters]
|
||||||
ServerPort=${cfg.listenAddress}
|
ServerPort=${cfg.listenAddress}
|
||||||
RunAs=${virtuosoUser}
|
RunAs=${virtuosoUser}
|
||||||
|
${optionalString (cfg.dirsAllowed != null) "DirsAllowed=${cfg.dirsAllowed}"}
|
||||||
|
|
||||||
[HTTPServer]
|
[HTTPServer]
|
||||||
${optionalString (cfg.httpListenAddress != null) "ServerPort=${cfg.httpListenAddress}"}
|
${optionalString (cfg.httpListenAddress != null) "ServerPort=${cfg.httpListenAddress}"}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user