From e5b3918f85d384aaf9b9b7187f7f6723084b70ef Mon Sep 17 00:00:00 2001 From: Peter Feigl Date: Fri, 27 Mar 2015 13:11:30 +0100 Subject: [PATCH 1/2] apache-httpd: adding support for sslServerChain --- nixos/modules/services/web-servers/apache-httpd/default.nix | 3 +++ .../web-servers/apache-httpd/per-server-options.nix | 6 ++++++ 2 files changed, 9 insertions(+) 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..c2d70085a4ea 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 extra chain file."; + }; + adminAddr = mkOption ({ type = types.nullOr types.str; example = "admin@example.org"; From 3837ef82adbd7b7acd79856024a52e37fdbdaff7 Mon Sep 17 00:00:00 2001 From: Peter Feigl Date: Mon, 13 Apr 2015 15:42:01 +0200 Subject: [PATCH 2/2] fixing documentation --- .../services/web-servers/apache-httpd/per-server-options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c2d70085a4ea..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 @@ -59,7 +59,7 @@ with lib; sslServerChain = mkOption { type = types.path; example = "/var/ca.pem"; - description = "Path to server SSL extra chain file."; + description = "Path to server SSL chain file."; }; adminAddr = mkOption ({