diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-03-17 23:25:33 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-03-17 23:25:33 +0100 |
| commit | e5e5cfbf33008ca3260cd4f2dd78986694dfb027 (patch) | |
| tree | a32d54e43425ef50cfbeb9ae3f7c6d6ce971acaa /machines | |
| parent | 2e275c32e1754d28f4820b116067a1918f6b01d0 (diff) | |
Add common.nix and use it for all machines.
We now have "pkgs.labernix" available for every machine. Also, we're deactivating the packet filter by default, so we can use it whenever we _really_ need it. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/heinrich.nix | 2 | ||||
| -rw-r--r-- | machines/labtop.nix | 2 | ||||
| -rw-r--r-- | machines/mailserver.nix | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/machines/heinrich.nix b/machines/heinrich.nix index 3eaddea5..8ce69950 100644 --- a/machines/heinrich.nix +++ b/machines/heinrich.nix @@ -43,7 +43,7 @@ let }; in { - imports = mapAttrsToList mkRouteConfig routes; + imports = singleton ../common.nix ++ mapAttrsToList mkRouteConfig routes; options.heinrich = { internalInterface = mkOption { diff --git a/machines/labtop.nix b/machines/labtop.nix index a66ceea3..bf376ba5 100644 --- a/machines/labtop.nix +++ b/machines/labtop.nix @@ -24,6 +24,8 @@ let }; in { + imports = [ ../common.nix ]; + i18n = { consoleFont = "lat9w-16"; consoleKeyMap = "us"; diff --git a/machines/mailserver.nix b/machines/mailserver.nix index 30809d5b..86f6edac 100644 --- a/machines/mailserver.nix +++ b/machines/mailserver.nix @@ -35,7 +35,11 @@ ''}"; in { - imports = [ ../modules/postfix/restrictions.nix ]; + imports = [ + ../common.nix + ../modules/postfix/restrictions.nix # XXX: Refactor and remove! + ]; + services.spamassassin.enable = true; services.postfix.enable = true; |