Now public key is copied to store (and its hash affects derivation hash)

svn path=/nixos/trunk/; revision=10954

system/options.nix

@@ -1891,6 +1891,22 @@
       ";
     };
 
+    seccureKeys = {
+      public = mkOption {
+        default = /var/elliptic-keys/public;
+	description = "
+	  Public key. Make it path argument, so it is copied into store and
+	  hashed.
+	";
+      };
+      private = mkOption {
+        default = "/var/elliptic-keys/private";
+	description = "
+	  Private key. Make it string argument, so it is not copied into store.
+	";
+      };
+    };
+
     sudo = {
 
       enable = mkOption {

upstart-jobs/gw6c.nix

@@ -11,6 +11,8 @@ let
 		server = cfg.server;
 		keepAlive = cfg.keepAlive;
 		everPing = cfg.everPing;
+
+		seccureKeys = config.security.seccureKeys;
 	};
 in
 {