diff options
| author | tv <tv@krebsco.de> | 2016-06-06 17:17:07 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-06-06 17:17:07 +0200 |
| commit | dda2887e2cf618a7c7744bee2eed806e3a38fe36 (patch) | |
| tree | 19ad3210a2b8485ac22d26f75b2e2493d3f61596 /lass/1systems/cloudkrebs.nix | |
| parent | c1c645b545b960eb639fc6d41dfa35ee187ae164 (diff) | |
| parent | 7e344c0627a266685ef1ad79f5193b4e7ba27408 (diff) | |
Merge remote-tracking branch 'cloudkrebs/master'
Diffstat (limited to 'lass/1systems/cloudkrebs.nix')
| -rw-r--r-- | lass/1systems/cloudkrebs.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix index 6cfba567a..a3cc9d7b3 100644 --- a/lass/1systems/cloudkrebs.nix +++ b/lass/1systems/cloudkrebs.nix @@ -8,11 +8,13 @@ in { imports = [ ../. ../2configs/os-templates/CAC-CentOS-7-64bit.nix - ../2configs/base.nix + ../2configs/default.nix + ../2configs/exim-retiolum.nix ../2configs/retiolum.nix - ../2configs/fastpoke-pages.nix ../2configs/git.nix ../2configs/realwallpaper.nix + ../2configs/realwallpaper-server.nix + ../2configs/privoxy-retiolum.nix { networking.interfaces.enp2s1.ip4 = [ { |