diff options
| author | makefu <github@syntax-fehler.de> | 2016-05-24 22:27:21 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-05-24 22:27:21 +0200 |
| commit | c1971f5aa04553c022fac4d7df7221aef66826a2 (patch) | |
| tree | b13db787aea2c4380b1308112d542eb1b7a4bc9d /lass/1systems/cloudkrebs.nix | |
| parent | 9cba0ffefa95079168f3419cf11eb98400a468db (diff) | |
| parent | facb65bd22226742b1805138b2841b29c4c26012 (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 = [ { |