diff options
| author | lassulus <lassulus@lassul.us> | 2018-02-16 22:40:19 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2018-02-16 22:40:19 +0100 |
| commit | e6486980dd1821d62aae4015092c7e719b23622b (patch) | |
| tree | 5882176d32591e96269f18e5f14543da02427c74 /makefu/1systems/omo | |
| parent | 5187d0177c2c347838bac00fa981703bfd9a983e (diff) | |
| parent | b28b86580d22e67d9a0552e96841643f77e03927 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/omo')
| -rw-r--r-- | makefu/1systems/omo/config.nix | 2 |
1 files changed, 1 insertions, 1 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"; |