summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorKevin Cox <kevincox@kevincox.ca>2015-12-02 20:36:19 -0500
committerRok Garbas <rok@garbas.si>2015-12-22 01:28:39 +0100
commit3acf8132c3ddd01b3e0e3909d11b08d58e30ccb1 (patch)
tree6695f2086a6ff33186929ba2b5f402d65a58f76f /nixos
parenta2fb70b6dfad623f0bdacd1768659db4eac58c98 (diff)
downloadnixlib-3acf8132c3ddd01b3e0e3909d11b08d58e30ccb1.tar
nixlib-3acf8132c3ddd01b3e0e3909d11b08d58e30ccb1.tar.gz
nixlib-3acf8132c3ddd01b3e0e3909d11b08d58e30ccb1.tar.bz2
nixlib-3acf8132c3ddd01b3e0e3909d11b08d58e30ccb1.tar.lz
nixlib-3acf8132c3ddd01b3e0e3909d11b08d58e30ccb1.tar.xz
nixlib-3acf8132c3ddd01b3e0e3909d11b08d58e30ccb1.tar.zst
nixlib-3acf8132c3ddd01b3e0e3909d11b08d58e30ccb1.zip
murmur: sslCa and extraConfig options, fixes #11419
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/murmur.nix15
1 files changed, 15 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index 4f91a4947479..1cc19a2c9e09 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -39,6 +39,9 @@ let
     certrequired=${if cfg.clientCertRequired then "true" else "false"}
     ${if cfg.sslCert == "" then "" else "sslCert="+cfg.sslCert}
     ${if cfg.sslKey  == "" then "" else "sslKey="+cfg.sslKey}
+    ${if cfg.sslCa   == "" then "" else "sslCA="+cfg.sslCa}
+    
+    ${cfg.extraConfig}
   '';
 in
 {
@@ -219,6 +222,18 @@ in
         default = "";
         description = "Path to your SSL key.";
       };
+
+      sslCa = mkOption {
+        type = types.str;
+        default = "";
+        description = "Path to your SSL CA certificate.";
+      };
+
+      extraConfig = mkOption {
+        type = types.str;
+        default = "";
+        description = "Extra configuration to put into mumur.ini.";
+      };
     };
   };