From dd3da963182cea6056f26cf7bb3efd0655ac0f6f Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Tue, 31 Mar 2020 16:29:39 +0200 Subject: nixos/magic-wormhole-mailbox-server: moving from mail to networking --- nixos/modules/module-list.nix | 2 +- .../mail/magic-wormhole-mailbox-server.nix | 28 ---------------------- .../networking/magic-wormhole-mailbox-server.nix | 28 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 nixos/modules/services/mail/magic-wormhole-mailbox-server.nix create mode 100644 nixos/modules/services/networking/magic-wormhole-mailbox-server.nix (limited to 'nixos') diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dafece285b64..697e9a6c8761 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -394,7 +394,6 @@ ./services/mail/mailcatcher.nix ./services/mail/mailhog.nix ./services/mail/mailman.nix - ./services/mail/magic-wormhole-mailbox-server.nix ./services/mail/mlmmj.nix ./services/mail/offlineimap.nix ./services/mail/opendkim.nix @@ -643,6 +642,7 @@ ./services/networking/lldpd.nix ./services/networking/logmein-hamachi.nix ./services/networking/mailpile.nix + ./services/networking/magic-wormhole-mailbox-server.nix ./services/networking/matterbridge.nix ./services/networking/mjpg-streamer.nix ./services/networking/minidlna.nix diff --git a/nixos/modules/services/mail/magic-wormhole-mailbox-server.nix b/nixos/modules/services/mail/magic-wormhole-mailbox-server.nix deleted file mode 100644 index 09d357cd2b6e..000000000000 --- a/nixos/modules/services/mail/magic-wormhole-mailbox-server.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.magic-wormhole-mailbox-server; - dataDir = "/var/lib/magic-wormhole-mailbox-server;"; - python = pkgs.python3.withPackages (py: [ py.magic-wormhole-mailbox-server py.twisted ]); -in -{ - options.services.magic-wormhole-mailbox-server = { - enable = mkEnableOption "Enable Magic Wormhole Mailbox Server"; - }; - - config = mkIf cfg.enable { - systemd.services.magic-wormhole-mailbox-server = { - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - DynamicUser = true; - ExecStart = "${python}/bin/twistd --nodaemon wormhole-mailbox"; - WorkingDirectory = dataDir; - StateDirectory = baseNameOf dataDir; - }; - }; - - }; -} diff --git a/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix b/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix new file mode 100644 index 000000000000..09d357cd2b6e --- /dev/null +++ b/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.magic-wormhole-mailbox-server; + dataDir = "/var/lib/magic-wormhole-mailbox-server;"; + python = pkgs.python3.withPackages (py: [ py.magic-wormhole-mailbox-server py.twisted ]); +in +{ + options.services.magic-wormhole-mailbox-server = { + enable = mkEnableOption "Enable Magic Wormhole Mailbox Server"; + }; + + config = mkIf cfg.enable { + systemd.services.magic-wormhole-mailbox-server = { + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + ExecStart = "${python}/bin/twistd --nodaemon wormhole-mailbox"; + WorkingDirectory = dataDir; + StateDirectory = baseNameOf dataDir; + }; + }; + + }; +} -- cgit 1.4.1