From e09250d41ccaf65c570ba94c0335493365807770 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Apr 2014 00:09:31 +0200
Subject: Disable allowUnfree by default

Fixes #2134.
---
 nixos/modules/services/security/fprot.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'nixos/modules/services')

diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix
index 9f1fc4ed6d8..a109191be55 100644
--- a/nixos/modules/services/security/fprot.nix
+++ b/nixos/modules/services/security/fprot.nix
@@ -18,7 +18,6 @@ in {
 	};
 
 	productData = mkOption {
-	  default = "${pkgs.fprot}/opt/f-prot/product.data";
 	  description = ''
 	    product.data file. Defaults to the one supplied with installation package.
 	  '';
@@ -32,7 +31,6 @@ in {
 	};
 
 	licenseKeyfile = mkOption {
-	  default = "${pkgs.fprot}/opt/f-prot/license.key";
 	  description = ''
 	    License keyfile. Defaults to the one supplied with installation package.
 	  '';
@@ -45,6 +43,10 @@ in {
   ###### implementation
 
   config = mkIf cfg.updater.enable {
+
+    services.fprot.updater.productData = "${pkgs.fprot}/opt/f-prot/product.data";
+    services.fprot.updater.licenseKeyfile = "${pkgs.fprot}/opt/f-prot/license.key";
+
     environment.systemPackages = [ pkgs.fprot ];
     environment.etc = singleton {
       source = "${pkgs.fprot}/opt/f-prot/f-prot.conf";
-- 
cgit 1.4.1