From 4f9af77287b518831ad1267228382705537bb39e Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kjw53@cam.ac.uk>
Date: Mon, 6 Nov 2017 17:17:24 +0000
Subject: [PATCH] kerberos-server: cleanup of kerberos.nix

General cleanup before adding more options.
---
 nixos/modules/services/system/kerberos.nix | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix
index 5647281db98..950756aa836 100644
--- a/nixos/modules/services/system/kerberos.nix
+++ b/nixos/modules/services/system/kerberos.nix
@@ -1,22 +1,15 @@
 {pkgs, config, lib, ...}:
 
 let
-
   inherit (lib) mkOption mkIf;
-
-  inherit (pkgs) heimdalFull;
-
+  cfg = config.services.kerberos_server;
   stateDir = "/var/heimdal";
 in
 
 {
-
   ###### interface
-
   options = {
-
     services.kerberos_server = {
-
       enable = mkOption {
         default = false;
         description = ''
@@ -25,15 +18,13 @@ in
       };
 
     };
-
   };
 
 
   ###### implementation
 
-  config = mkIf config.services.kerberos_server.enable {
-
-    environment.systemPackages = [ heimdalFull ];
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.heimdalFull ];
     systemd.services.kadmind = {
       description = "Kerberos Administration Daemon";
       script = "${pkgs.heimdalFull}/libexec/heimdal/kadmind";
@@ -45,13 +36,13 @@ in
       preStart = ''
         mkdir -m 0755 -p ${stateDir}
       '';
-      script = "${heimdalFull}/libexec/heimdal/kdc";
+      script = "${pkgs.heimdalFull}/libexec/heimdal/kdc";
     };
 
     systemd.services.kpasswdd = {
       description = "Kerberos Password Changing daemon";
       wantedBy = [ "multi-user.target" ];
-      script = "${heimdalFull}/libexec/heimdal/kpasswdd";
+      script = "${pkgs.heimdalFull}/libexec/heimdal/kpasswdd";
     };
   };
 }