diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-08-04 00:26:34 +0200 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2018-08-04 00:26:34 +0200 |
commit | e2a32b747fd6a1291540064b82ab43a37efad635 (patch) | |
tree | 340ee4b6124e72f8f59aee7e6cb487fc683066bb /nixos/modules | |
parent | 32bda9a1129bf71757bcf710cbaa2d64380aa5c6 (diff) | |
download | nixlib-e2a32b747fd6a1291540064b82ab43a37efad635.tar nixlib-e2a32b747fd6a1291540064b82ab43a37efad635.tar.gz nixlib-e2a32b747fd6a1291540064b82ab43a37efad635.tar.bz2 nixlib-e2a32b747fd6a1291540064b82ab43a37efad635.tar.lz nixlib-e2a32b747fd6a1291540064b82ab43a37efad635.tar.xz nixlib-e2a32b747fd6a1291540064b82ab43a37efad635.tar.zst nixlib-e2a32b747fd6a1291540064b82ab43a37efad635.zip |
Revert "nixos/disnix: fix broken service because of rename"
Broke evaluation of the nixos options. The option `services.dysnomia' defined in `.../nixos/modules/rename.nix' does not exist. This reverts commit 5c897b4effc4f51b2d6aa5dba158a839b179d964.
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/misc/disnix.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/misc/dysnomia.nix | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index c21cb2afc3ca..bb3ac1ecf075 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -47,7 +47,7 @@ in ###### implementation config = mkIf cfg.enable { - dysnomia.enable = true; + services.dysnomia.enable = true; environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix index 61ea822890ed..ba74b18b6970 100644 --- a/nixos/modules/services/misc/dysnomia.nix +++ b/nixos/modules/services/misc/dysnomia.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.dysnomia; + cfg = config.services.dysnomia; printProperties = properties: concatMapStrings (propertyName: @@ -69,7 +69,7 @@ let in { options = { - dysnomia = { + services.dysnomia = { enable = mkOption { type = types.bool; @@ -142,7 +142,7 @@ in environment.systemPackages = [ cfg.package ]; - dysnomia.package = pkgs.dysnomia.override (origArgs: { + services.dysnomia.package = pkgs.dysnomia.override (origArgs: { enableApacheWebApplication = config.services.httpd.enable; enableAxis2WebService = config.services.tomcat.axis2.enable; enableEjabberdDump = config.services.ejabberd.enable; @@ -153,7 +153,7 @@ in enableMongoDatabase = config.services.mongodb.enable; }); - dysnomia.properties = { + services.dysnomia.properties = { hostname = config.networking.hostName; inherit (config.nixpkgs.localSystem) system; @@ -171,7 +171,7 @@ in }}"); }; - dysnomia.containers = lib.recursiveUpdate ({ + services.dysnomia.containers = lib.recursiveUpdate ({ process = {}; wrapper = {}; } |