mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
* Synced with trunk @ 15408
svn path=/nixos/branches/modular-nixos/; revision=15617
This commit is contained in:
parent
d26f944b98
commit
7ef8db8aad
@ -3,10 +3,9 @@
|
||||
let
|
||||
|
||||
inherit (pkgs.lib) mkOption;
|
||||
inherit (config) urlPrefix distDir;
|
||||
|
||||
dataDir = "/data/pt-wiki/data";
|
||||
pubDir = "/data/pt-wiki/pub";
|
||||
dataDir = config.dataDir; # "/data/pt-wiki/data";
|
||||
pubDir = config.pubDir; # "/data/pt-wiki/pub";
|
||||
|
||||
scriptUrlPath = "/bin";
|
||||
pubUrlPath = "/pub";
|
||||
@ -17,19 +16,18 @@ let
|
||||
dispScriptUrlPath = "";
|
||||
dispViewPath = "";
|
||||
|
||||
twikiName = "Program Transformation Wiki";
|
||||
startWeb = config.startWeb;
|
||||
registrationDomain = "ewi.tudelft.nl";
|
||||
defaultUrlHost = "";
|
||||
|
||||
# Build the TWiki CGI and configuration files.
|
||||
twikiRoot = (import /etc/nixos/services/twiki/twiki-instance.nix).twiki {
|
||||
name = "pt-wiki";
|
||||
name = "wiki-instance";
|
||||
pubdir = pubDir;
|
||||
datadir = dataDir;
|
||||
inherit twikiName scriptUrlPath pubUrlPath absHostPath
|
||||
dispPubUrlPath dispScriptUrlPath dispViewPath
|
||||
registrationDomain defaultUrlHost;
|
||||
inherit scriptUrlPath pubUrlPath absHostPath
|
||||
dispPubUrlPath dispScriptUrlPath dispViewPath defaultUrlHost;
|
||||
twikiName = config.twikiName;
|
||||
registrationDomain = config.registrationDomain;
|
||||
};
|
||||
|
||||
plugins = import /etc/nixos/services/twiki/server-pkgs/twiki-plugins.nix;
|
||||
@ -111,4 +109,38 @@ in {
|
||||
Disallow: /pt/bin/
|
||||
'';
|
||||
|
||||
options = {
|
||||
|
||||
dataDir = mkOption {
|
||||
example = "/data/wiki/data";
|
||||
description = "
|
||||
Path to the directory that holds the Wiki data.
|
||||
";
|
||||
};
|
||||
|
||||
pubDir = mkOption {
|
||||
example = "/data/wiki/pub";
|
||||
description = "
|
||||
Path to the directory that holds uploaded files.
|
||||
";
|
||||
};
|
||||
|
||||
twikiName = mkOption {
|
||||
default = "Wiki";
|
||||
example = "Foobar Wiki";
|
||||
description = "
|
||||
Name of this Wiki.
|
||||
";
|
||||
};
|
||||
|
||||
registrationDomain = mkOption {
|
||||
example = "example.org";
|
||||
description = "
|
||||
Domain from which registrations are permitted. Use `all' to
|
||||
permit registrations from anywhere.
|
||||
";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
Loading…
Reference in New Issue
Block a user