diff options
Diffstat (limited to 'makefu/1systems')
-rw-r--r-- | makefu/1systems/omo/config.nix | 2 | ||||
-rw-r--r-- | makefu/1systems/sdev/config.nix | 4 | ||||
-rw-r--r-- | makefu/1systems/vbob/config.nix | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index 4e0d2a05f..01438397e 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -71,6 +71,7 @@ in { <stockholm/makefu/2configs/mqtt.nix> <stockholm/makefu/2configs/remote-build/slave.nix> <stockholm/makefu/2configs/deployment/google-muell.nix> + <stockholm/makefu/2configs/virtualisation/docker.nix> # security @@ -119,7 +120,6 @@ in { services.sabnzbd.enable = true; systemd.services.sabnzbd.environment.SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; - virtualisation.docker.enable = true; makefu.ps3netsrv = { enable = true; servedir = "/media/cryptX/emu/ps3"; diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix index 81e8cd4d1..7a87362d8 100644 --- a/makefu/1systems/sdev/config.nix +++ b/makefu/1systems/sdev/config.nix @@ -18,6 +18,7 @@ # environment <stockholm/makefu/2configs/tinc/retiolum.nix> + <stockholm/makefu/2configs/virtualisation/docker.nix> ]; # allow sdev to deploy self @@ -31,7 +32,6 @@ ppp xclip get passwdqc-utils - docker gnupg populate (pkgs.writeScriptBin "tor-browser" '' @@ -40,8 +40,6 @@ '') ]; - virtualisation.docker.enable = true; - networking.firewall.allowedTCPPorts = [ 25 80 diff --git a/makefu/1systems/vbob/config.nix b/makefu/1systems/vbob/config.nix index c74f6edbe..1f68ad9c2 100644 --- a/makefu/1systems/vbob/config.nix +++ b/makefu/1systems/vbob/config.nix @@ -71,7 +71,6 @@ fortclientsslvpn ppp xclip get logstash - # docker #devpi-web #devpi-client ansible |