From b54670185c653846faa8b9db5d4f36107962edbd Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 14 Feb 2018 09:49:57 +0100
Subject: [PATCH] ma docker: use 2configs
---
1systems/omo/config.nix | 2 +-
1systems/sdev/config.nix | 4 +---
1systems/vbob/config.nix | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/1systems/omo/config.nix b/1systems/omo/config.nix
index 4e0d2a0..0143839 100644
--- a/1systems/omo/config.nix
+++ b/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/1systems/sdev/config.nix b/1systems/sdev/config.nix
index 81e8cd4..7a87362 100644
--- a/1systems/sdev/config.nix
+++ b/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/1systems/vbob/config.nix b/1systems/vbob/config.nix
index c74f6ed..1f68ad9 100644
--- a/1systems/vbob/config.nix
+++ b/1systems/vbob/config.nix
@@ -71,7 +71,6 @@
fortclientsslvpn ppp xclip
get
logstash
- # docker
#devpi-web
#devpi-client
ansible