diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-30 18:30:23 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-30 18:47:44 +0100 |
commit | 244cf195c88acff952ff0304c8e48a109f4b6754 (patch) | |
tree | dfeda2b6b0218e4eaa10efa06292e360bf4d2125 /nixos/modules/services/databases/4store-endpoint.nix | |
parent | c7171b2c8fc5671cdc989c88aa8f959dac836a98 (diff) |
Use the "assertions" option instead of mkAssert
Diffstat (limited to 'nixos/modules/services/databases/4store-endpoint.nix')
-rw-r--r-- | nixos/modules/services/databases/4store-endpoint.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix index 7b03b4d8f1dc5..7872ea2dc6a3d 100644 --- a/nixos/modules/services/databases/4store-endpoint.nix +++ b/nixos/modules/services/databases/4store-endpoint.nix @@ -24,12 +24,12 @@ with pkgs.lib; }; listenAddress = mkOption { - default = null; + default = null; description = "IP address to listen on."; }; port = mkOption { - default = 8080; + default = 8080; description = "port to listen on."; }; @@ -45,9 +45,12 @@ with pkgs.lib; ###### implementation - config = mkIf cfg.enable ( - mkAssert (cfg.enable -> cfg.database != "") - "Must specify database name" { + config = mkIf cfg.enable { + + assertions = singleton + { assertion = cfg.enable -> cfg.database != ""; + message = "Must specify 4Store database name"; + }; users.extraUsers = singleton { name = endpointUser; @@ -63,10 +66,10 @@ with pkgs.lib; startOn = "filesystem"; exec = '' - ${run} '${pkgs.rdf4store}/bin/4s-httpd -D ${cfg.options} ${if cfg.listenAddress!=null then "-H ${cfg.listenAddress}" else "" } -p ${toString cfg.port} ${cfg.database}' + ${run} '${pkgs.rdf4store}/bin/4s-httpd -D ${cfg.options} ${if cfg.listenAddress!=null then "-H ${cfg.listenAddress}" else "" } -p ${toString cfg.port} ${cfg.database}' ''; }; - }); + }; } |