diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-04-13 16:48:20 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-04-13 16:48:20 +0200 |
| commit | 574173f0e6f4d16ffe00cc46c0ece055aaa249a3 (patch) | |
| tree | aa76d06d660defe955c132719332148a04d33ad5 /nixos/modules | |
| parent | 5501f5568bf4d43abe0eb9ab32505d2173b0c57f (diff) | |
| parent | 3837ef82adbd7b7acd79856024a52e37fdbdaff7 (diff) | |
| download | nixlib-574173f0e6f4d16ffe00cc46c0ece055aaa249a3.tar nixlib-574173f0e6f4d16ffe00cc46c0ece055aaa249a3.tar.gz nixlib-574173f0e6f4d16ffe00cc46c0ece055aaa249a3.tar.bz2 nixlib-574173f0e6f4d16ffe00cc46c0ece055aaa249a3.tar.lz nixlib-574173f0e6f4d16ffe00cc46c0ece055aaa249a3.tar.xz nixlib-574173f0e6f4d16ffe00cc46c0ece055aaa249a3.tar.zst nixlib-574173f0e6f4d16ffe00cc46c0ece055aaa249a3.zip | |
Merge pull request #7027 from ecraven/apache-sslchain
apache-httpd: adding support for sslServerChain
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/per-server-options.nix | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 2b5cba68d457..2885fd396525 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -231,6 +231,9 @@ let ${if cfg.sslServerCert != null then '' SSLCertificateFile ${cfg.sslServerCert} SSLCertificateKeyFile ${cfg.sslServerKey} + ${if cfg.sslServerChain != null then '' + SSLCertificateChainFile ${cfg.sslServerChain} + '' else ""} '' else ""} ${if cfg.enableSSL then '' diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix index 76f55a63e326..9fb25c37f5b1 100644 --- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix @@ -56,6 +56,12 @@ with lib; 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 ({ type = types.nullOr types.str; example = "admin@example.org"; |