1&2 lass: move exim/retiolum to retiolum.nix

This commit is contained in:
lassulus 2015-07-23 02:11:56 +02:00
parent a1ea09404f
commit d94b2132d5
4 changed files with 32 additions and 38 deletions

View File

@ -5,6 +5,7 @@
../../2configs/tv/CAC-Developer-2.nix
../../2configs/tv/CAC-CentOS-7-64bit.nix
../../2configs/lass/base.nix
../../2configs/lass/retiolum.nix
{
networking.interfaces.enp2s1.ip4 = [
{
@ -18,18 +19,6 @@
];
}
{
imports = [ ../../3modules/tv/retiolum.nix ];
tv.retiolum = {
enable = true;
hosts = ../../Zhosts;
connectTo = [
"fastpoke"
"gum"
"pigstarter"
];
};
}
{
imports = [ ../../3modules/tv/identity.nix ];
tv.identity = {

View File

@ -20,19 +20,7 @@
../../2configs/lass/chromium-patched.nix
../../2configs/lass/git-repos.nix
../../2configs/tv/synaptics.nix
../../2configs/tv/exim-retiolum.nix
{
imports = [ ../../3modules/tv/retiolum.nix ];
tv.retiolum = {
enable = true;
hosts = ../../Zhosts;
connectTo = [
"fastpoke"
"gum"
"pigstarter"
];
};
}
../../2configs/lass/retiolum.nix
{
imports = [ ../../3modules/tv/identity.nix ];
tv.identity = {

View File

@ -12,19 +12,7 @@ with builtins;
../../2configs/lass/bird.nix
../../2configs/lass/git-repos.nix
../../2configs/lass/chromium-patched.nix
../../2configs/tv/exim-retiolum.nix
{
imports = [ ../../3modules/tv/retiolum.nix ];
tv.retiolum = {
enable = true;
hosts = ../../Zhosts;
connectTo = [
"fastpoke"
"gum"
"pigstarter"
];
};
}
../../2configs/lass/retiolum.nix
{
imports = [ ../../3modules/tv/identity.nix ];
tv.identity = {

View File

@ -0,0 +1,29 @@
{ ... }:
{
imports = [
../../3modules/lass/iptables.nix
../../3modules/tv/retiolum.nix
../../2configs/tv/exim-retiolum.nix
];
lass.iptables = {
tables = {
filter.INPUT.rules = [
{ predicate = "-p tcp --dport smtp"; target = "ACCEPT"; }
{ predicate = "-p tcp --dport tinc"; target = "ACCEPT"; }
{ predicate = "-p udp --dport tinc"; target = "ACCEPT"; }
];
};
};
tv.retiolum = {
enable = true;
hosts = ../../Zhosts;
connectTo = [
"fastpoke"
"cloudkrebs"
"pigstarter"
];
};
}