suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge pull request #7027 from ecraven/apache-sslchain

Browse Source 
apache-httpd: adding support for sslServerChain
This commit is contained in:
Eelco Dolstra 2015-04-13 16:48:20 +02:00
commit 574173f0e6
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/web-servers/apache-httpd/default.nix
View File

@ -231,6 +231,9 @@ let
${if cfg.sslServerCert != null then '' ${if cfg.sslServerCert != null then ''
SSLCertificateFile ${cfg.sslServerCert} SSLCertificateFile ${cfg.sslServerCert}
SSLCertificateKeyFile ${cfg.sslServerKey} SSLCertificateKeyFile ${cfg.sslServerKey}
${if cfg.sslServerChain != null then ''
SSLCertificateChainFile ${cfg.sslServerChain}
'' else ""}
'' else ""} '' else ""}
${if cfg.enableSSL then '' ${if cfg.enableSSL then ''

6
nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
View File

@ -56,6 +56,12 @@ with lib;
description = "Path to server SSL certificate key."; description = "Path to server SSL certificate key.";
}; };
sslServerChain = mkOption {
type = types.path;
example = "/var/ca.pem";
description = "Path to server SSL chain file.";
};
adminAddr = mkOption ({ adminAddr = mkOption ({
type = types.nullOr types.str; type = types.nullOr types.str;
example = "admin@example.org"; example = "admin@example.org";