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

HTTPS support in httpd upstart job fixed.

Browse Source 
svn path=/nixos/trunk/; revision=11613
This commit is contained in:
Michael Raskin 2008-04-12 20:08:35 +00:00
parent bfa0e51ee5
commit 5e1ee10f3c
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
system/options.nix
View File

@ -1464,6 +1464,22 @@
"; ";
}; };
sslServerCert = mkOption {
default = "";
example = /var/host.cert;
description = "
Path to server SSL certificate.
";
};
sslServerKey = mkOption {
default = "";
example = /var/host.key;
description = "
Path to server SSL certificate key.
";
};
logDir = mkOption { logDir = mkOption {
default = "/var/log/httpd"; default = "/var/log/httpd";
description = " description = "

8
upstart-jobs/apache-httpd/default.nix
View File

@ -58,6 +58,8 @@ let
allSubservices = mainSubservices ++ pkgs.lib.concatMap subservicesFor vhosts; allSubservices = mainSubservices ++ pkgs.lib.concatMap subservicesFor vhosts;
sslServerCert = cfg.sslServerCert;
sslServerKey = cfg.sslServerKey;
# !!! should be in lib # !!! should be in lib
writeTextInDir = name: text: writeTextInDir = name: text:
@ -81,7 +83,7 @@ let
"mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs" "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
"vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling" "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
"userdir" "alias" "rewrite" "proxy" "proxy_http" "userdir" "alias" "rewrite" "proxy" "proxy_http"
] ++ optional cfg.enableSSL "ssl_module"; ] ++ optional cfg.enableSSL "ssl";
loggingConf = '' loggingConf = ''
@ -128,8 +130,8 @@ let
SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
SSLCertificateFile @sslServerCert@ SSLCertificateFile ${sslServerCert}
SSLCertificateKeyFile @sslServerKey@ SSLCertificateKeyFile ${sslServerKey}
# MSIE compatability. # MSIE compatability.
SetEnvIf User-Agent ".*MSIE.*" \ SetEnvIf User-Agent ".*MSIE.*" \