summaryrefslogtreecommitdiffstats
path: root/lass/1systems/mors.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-04-17 13:15:13 +0200
committermakefu <github@syntax-fehler.de>2017-04-17 13:15:13 +0200
commit35c7e1c37545dd96c90d54191ba835eb0ceeac8e (patch)
tree65db0a2d770654f555fcac74c8e457261054df5d /lass/1systems/mors.nix
parent9d7e9bf4a9630bb763d7d7bff7880c70405c7ea3 (diff)
parentb6a4df7e398c7b4d7dc4f56d2eded22a79fee30f (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/1systems/mors.nix')
-rw-r--r--lass/1systems/mors.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index c196b391a..c8d9465d5 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -25,6 +25,7 @@ with import <stockholm/lib>;
../2configs/repo-sync.nix
../2configs/ircd.nix
../2configs/logf.nix
+ ../2configs/syncthing.nix
{
#risk of rain port
krebs.iptables.tables.filter.INPUT.rules = [
@@ -77,10 +78,6 @@ with import <stockholm/lib>;
services.redis.enable = true;
}
{
- #ipfs-testing
- services.ipfs.enable = true;
- }
- {
environment.systemPackages = [
pkgs.krebszones
];
@@ -89,6 +86,12 @@ with import <stockholm/lib>;
#ps vita stuff
boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
}
+ {
+ services.tor = {
+ enable = true;
+ client.enable = true;
+ };
+ }
];
krebs.build.host = config.krebs.hosts.mors;