summaryrefslogtreecommitdiffstats
path: root/modules/wu
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-06-22 20:11:02 +0200
committertv <tv@shackspace.de>2015-06-22 20:11:02 +0200
commit68a968ac1b1a077494efb56e18c83e79fe0bae7f (patch)
tree385aed841a2d9f7320ca35a3ce67093cb5b8470e /modules/wu
parentf825bf5e9eb43c0c3c5858b8ca60f2c4e5d66921 (diff)
tv retiolum: split module into options and config
Diffstat (limited to 'modules/wu')
-rw-r--r--modules/wu/default.nix31
1 files changed, 11 insertions, 20 deletions
diff --git a/modules/wu/default.nix b/modules/wu/default.nix
index f72314696..54b8587c5 100644
--- a/modules/wu/default.nix
+++ b/modules/wu/default.nix
@@ -14,7 +14,6 @@ in
../common/nixpkgs.nix
../tv/base.nix
../tv/exim-retiolum.nix
- ../tv/retiolum.nix
../tv/sanitize.nix
../tv/smartd.nix
../tv/synaptics.nix
@@ -44,6 +43,17 @@ in
];
};
}
+ {
+ imports = [ ../tv/retiolum ];
+ tv.retiolum = {
+ enable = true;
+ hosts = <retiolum-hosts>;
+ connectTo = [
+ "gum"
+ "pigstarter"
+ ];
+ };
+ }
];
nix.maxJobs = 8;
@@ -342,25 +352,6 @@ in
# '';
#};
- services.retiolum = {
- enable = true;
- hosts = <retiolum-hosts>;
- connectTo = [
- "gum"
- "pigstarter"
- ];
- };
-
- # TODO
- #services.tinc = {
- # enable = true;
- # network = "retiolum";
- # hosts = /home/tv/krebs/hosts;
- # privateKeyFile = /etc/tinc/retiolum/rsa_key.priv;
- # connectTo = [ "fastpoke" "pigstarter" "kheurop" ];
- #};
-
-
security.rtkit.enable = false;
services.nscd.enable = false;
services.ntp.enable = false;