* Don't hardcode values specific to the program transformation / Stratego wikis.
svn path=/nixos/trunk/; revision=15408
This commit is contained in:
parent
a29bfb0d7b
commit
ef64840085
@ -3,10 +3,9 @@
|
|||||||
let
|
let
|
||||||
|
|
||||||
inherit (pkgs.lib) mkOption;
|
inherit (pkgs.lib) mkOption;
|
||||||
inherit (config) urlPrefix distDir;
|
|
||||||
|
|
||||||
dataDir = "/data/pt-wiki/data";
|
dataDir = config.dataDir; # "/data/pt-wiki/data";
|
||||||
pubDir = "/data/pt-wiki/pub";
|
pubDir = config.pubDir; # "/data/pt-wiki/pub";
|
||||||
|
|
||||||
scriptUrlPath = "/bin";
|
scriptUrlPath = "/bin";
|
||||||
pubUrlPath = "/pub";
|
pubUrlPath = "/pub";
|
||||||
@ -17,19 +16,18 @@ let
|
|||||||
dispScriptUrlPath = "";
|
dispScriptUrlPath = "";
|
||||||
dispViewPath = "";
|
dispViewPath = "";
|
||||||
|
|
||||||
twikiName = "Program Transformation Wiki";
|
|
||||||
startWeb = config.startWeb;
|
startWeb = config.startWeb;
|
||||||
registrationDomain = "ewi.tudelft.nl";
|
|
||||||
defaultUrlHost = "";
|
defaultUrlHost = "";
|
||||||
|
|
||||||
# Build the TWiki CGI and configuration files.
|
# Build the TWiki CGI and configuration files.
|
||||||
twikiRoot = (import /etc/nixos/services/twiki/twiki-instance.nix).twiki {
|
twikiRoot = (import /etc/nixos/services/twiki/twiki-instance.nix).twiki {
|
||||||
name = "pt-wiki";
|
name = "wiki-instance";
|
||||||
pubdir = pubDir;
|
pubdir = pubDir;
|
||||||
datadir = dataDir;
|
datadir = dataDir;
|
||||||
inherit twikiName scriptUrlPath pubUrlPath absHostPath
|
inherit scriptUrlPath pubUrlPath absHostPath
|
||||||
dispPubUrlPath dispScriptUrlPath dispViewPath
|
dispPubUrlPath dispScriptUrlPath dispViewPath defaultUrlHost;
|
||||||
registrationDomain defaultUrlHost;
|
twikiName = config.twikiName;
|
||||||
|
registrationDomain = config.registrationDomain;
|
||||||
};
|
};
|
||||||
|
|
||||||
plugins = import /etc/nixos/services/twiki/server-pkgs/twiki-plugins.nix;
|
plugins = import /etc/nixos/services/twiki/server-pkgs/twiki-plugins.nix;
|
||||||
@ -111,4 +109,38 @@ in {
|
|||||||
Disallow: /pt/bin/
|
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…
x
Reference in New Issue
Block a user