public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apache httpd customization - extraDirectories & noUserDir .

Browse Source 
svn path=/nixos/trunk/; revision=8985
This commit is contained in:
Michael Raskin 2007-07-15 11:16:01 +00:00
parent bf1033d2cb
commit 055a950331
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
system/options.nix
View File

@ -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"]; name = ["services" "httpd" "subservices" "subversion" "enable"];

8
upstart-jobs/httpd.nix
View File

@ -20,12 +20,16 @@ let
logDir = getCfg "logDir"; logDir = getCfg "logDir";
stateDir = getCfg "stateDir"; stateDir = getCfg "stateDir";
enableSSL = false; enableSSL = false;
noUserDir = getCfg "noUserDir";
extraDirectories = getCfg "extraDirectories";
webServer = import ../services/apache-httpd { webServer = import ../services/apache-httpd {
inherit (pkgs) stdenv apacheHttpd coreutils; inherit (pkgs) apacheHttpd coreutils;
stdenv = pkgs.stdenvNewSetupScript;
inherit hostName httpPort httpsPort inherit hostName httpPort httpsPort
user group adminAddr logDir stateDir; user group adminAddr logDir stateDir
noUserDir extraDirectories;
subServices = subServices =