Apache httpd customization - extraDirectories & noUserDir .
svn path=/nixos/trunk/; revision=8985
This commit is contained in:
parent
bf1033d2cb
commit
055a950331
@ -736,6 +736,28 @@
|
||||
";
|
||||
}
|
||||
|
||||
{
|
||||
name = ["services" "httpd" "noUserDir"];
|
||||
default = true;
|
||||
description = "
|
||||
Set to false to let users to publish ~/public_html as /~user.
|
||||
";
|
||||
}
|
||||
|
||||
{
|
||||
name = ["services" "httpd" "extraDirectories"];
|
||||
default = "";
|
||||
example = "
|
||||
<Directory /home>
|
||||
Options FollowSymlinks
|
||||
AllowOverride All
|
||||
</Directory>
|
||||
";
|
||||
description = "
|
||||
These lines go to httpd.conf verbatim. They will go after
|
||||
directories and directory aliases defined by default.
|
||||
";
|
||||
}
|
||||
|
||||
{
|
||||
name = ["services" "httpd" "subservices" "subversion" "enable"];
|
||||
|
@ -20,12 +20,16 @@ let
|
||||
logDir = getCfg "logDir";
|
||||
stateDir = getCfg "stateDir";
|
||||
enableSSL = false;
|
||||
noUserDir = getCfg "noUserDir";
|
||||
extraDirectories = getCfg "extraDirectories";
|
||||
|
||||
webServer = import ../services/apache-httpd {
|
||||
inherit (pkgs) stdenv apacheHttpd coreutils;
|
||||
inherit (pkgs) apacheHttpd coreutils;
|
||||
stdenv = pkgs.stdenvNewSetupScript;
|
||||
|
||||
inherit hostName httpPort httpsPort
|
||||
user group adminAddr logDir stateDir;
|
||||
user group adminAddr logDir stateDir
|
||||
noUserDir extraDirectories;
|
||||
|
||||
subServices =
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user