From 6547ecb72f67a1f59d339a3faf91bb403f87cfc2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Aug 2012 14:47:37 -0400
Subject: [PATCH] Remove policykit.nix (old PolicyKit module)

Only the HAL module needed it.
---
 modules/module-list.nix        |  1 -
 modules/security/policykit.nix | 80 ----------------------------------
 2 files changed, 81 deletions(-)
 delete mode 100644 modules/security/policykit.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 9f3fa0d6fc5..14cf4f7012c 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -46,7 +46,6 @@
   ./security/ca.nix
   ./security/pam.nix
   ./security/pam_usb.nix
-  ./security/policykit.nix
   ./security/polkit.nix
   ./security/rtkit.nix
   ./security/setuid-wrappers.nix
diff --git a/modules/security/policykit.nix b/modules/security/policykit.nix
deleted file mode 100644
index 5aa02950f74..00000000000
--- a/modules/security/policykit.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-
-  conf = pkgs.writeText "PolicyKit.conf"
-    ''
-      <?xml version="1.0" encoding="UTF-8"?>
-
-      <!DOCTYPE pkconfig PUBLIC "-//freedesktop//DTD PolicyKit Configuration 1.0//EN"
-        "http://hal.freedesktop.org/releases/PolicyKit/1.0/config.dtd">
-
-      <config version="0.1">
-      </config>
-    '';
-
-in
-
-{
-
-  options = {
-
-    security.policykit.enable = mkOption {
-      default = false;
-      description = "Enable PolicyKit (obsolete).";
-    };
-
-  };
-
-
-  config = mkIf config.security.policykit.enable {
-
-    environment.systemPackages = [ pkgs.policykit ];
-
-    services.dbus.packages = [ pkgs.policykit ];
-
-    security.pam.services = [ { name = "polkit"; } ];
-
-    users.extraUsers = singleton
-      { name = "polkituser";
-        uid = config.ids.uids.polkituser;
-        description = "PolicyKit user";
-      };
-
-    users.extraGroups = singleton
-      { name = "polkituser";
-        gid = config.ids.gids.polkituser;
-      };
-
-    environment.etc =
-      [ { source = conf;
-          target = "PolicyKit/PolicyKit.conf";
-        }
-        { source = (pkgs.buildEnv {
-            name = "PolicyKit-policies";
-            pathsToLink = [ "/share/PolicyKit/policy" ];
-            paths = [ pkgs.policykit pkgs.consolekit pkgs.hal ];
-          }) + "/share/PolicyKit/policy";
-          target = "PolicyKit/policy";
-        }
-      ];
-
-    system.activationScripts.policyKit = stringAfter [ "users" ]
-      ''
-        mkdir -m 0770 -p /var/run/PolicyKit
-        chown root:polkituser /var/run/PolicyKit
-
-        mkdir -m 0770 -p /var/lib/PolicyKit
-        chown root:polkituser /var/lib/PolicyKit
-
-        mkdir -p /var/lib/misc
-        touch /var/lib/misc/PolicyKit.reload
-        chmod 0664 /var/lib/misc/PolicyKit.reload
-        chown polkituser:polkituser /var/lib/misc/PolicyKit.reload
-      '';
-
-  };
-
-}