diff options
author | Dominique Martinet @ jormungand <asmadeus@codewreck.org> | 2020-05-10 00:18:16 +0200 |
---|---|---|
committer | Dominique Martinet @ jormungand <asmadeus@codewreck.org> | 2020-05-10 00:18:30 +0200 |
commit | b5471bbad028826b94d7088f17bc37143faf8714 (patch) | |
tree | a813fa7fc495db436a9a882b7c0642bd665460af /machines/jormungand | |
parent | 77d118a6b12e7d7b02fccdb43b03e22ae3a3ff8a (diff) |
tor & vaderetro: move out of containers
also properly compile vaderetro in a package
Diffstat (limited to 'machines/jormungand')
-rw-r--r-- | machines/jormungand/configuration.nix | 1 | ||||
-rw-r--r-- | machines/jormungand/containers.nix | 38 |
2 files changed, 1 insertions, 38 deletions
diff --git a/machines/jormungand/configuration.nix b/machines/jormungand/configuration.nix index 0ddd4d3..32536cf 100644 --- a/machines/jormungand/configuration.nix +++ b/machines/jormungand/configuration.nix @@ -10,6 +10,7 @@ ./nginx.nix ./mpd.nix ../../modules/ashuffle.nix + ../../modules/vaderetro.nix ./containers.nix ]; diff --git a/machines/jormungand/containers.nix b/machines/jormungand/containers.nix index 58987b3..1a03a05 100644 --- a/machines/jormungand/containers.nix +++ b/machines/jormungand/containers.nix @@ -50,42 +50,4 @@ let targetConfig = { }; }; }; - - containers.tor = { - autoStart = true; - timeoutStartSec = "10m"; - config = { config, pkgs, ... }: targetConfig // { - services.tor = { - enable = true; - hiddenServices."vaderetro".map = [ - { port = 80; toPort = 8083; } - ]; - }; - }; - }; - - containers.vaderetro = { - autoStart = true; - timeoutStartSec = "10m"; - config = { config, pkgs, ... }: targetConfig // { - users.extraUsers.vaderetro = { isNormalUser = true; }; - environment.systemPackages = with pkgs; [ - rustup - gcc - ]; - systemd.services.vaderetro = { - description = "vaderetro server"; - path = [ pkgs.rustup pkgs.gcc pkgs.bash ]; - serviceConfig = { - Type = "simple"; - User = "vaderetro"; - ExecStart = '' -${pkgs.bash}/bin/bash -c 'cd /home/vaderetro/vr; RUST_LOG=vr=info cargo run --release' - ''; - Restart = "always"; - }; - wantedBy = [ "default.target" ]; - }; - }; - }; } |