summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-02-01 17:13:46 +0100
committertv <tv@krebsco.de>2016-02-01 17:13:46 +0100
commitf6a4131daecd6e5c1a0727adbcac43ba8530ec13 (patch)
tree88aba33e586e8cb0e6a2b6fd6e1e5da08584f087
parent1a5a3c0cf2aba173772765c24a0865bb2da6b691 (diff)
tv exim-retiolum: init
-rw-r--r--tv/1systems/nomic.nix7
-rw-r--r--tv/1systems/wu.nix5
-rw-r--r--tv/1systems/xu.nix8
-rw-r--r--tv/2configs/exim-retiolum.nix5
4 files changed, 8 insertions, 17 deletions
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 7bc7b70d2..145e9b236 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -5,11 +5,9 @@ with lib;
{
krebs.build.host = config.krebs.hosts.nomic;
- krebs.build.target = "root@nomic.gg23";
-
imports = [
../2configs/hw/AO753.nix
- #../2configs/consul-server.nix
+ ../2configs/exim-retiolum.nix
../2configs/git.nix
../2configs/pulse.nix
../2configs/xserver
@@ -25,9 +23,6 @@ with lib;
};
}
{
- krebs.exim-retiolum.enable = true;
- }
- {
krebs.nginx = {
enable = true;
servers.default.locations = [
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 3bdf8d37a..47fdb2092 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -7,7 +7,7 @@ with lib;
imports = [
../2configs/hw/w110er.nix
- #../2configs/consul-client.nix
+ ../2configs/exim-retiolum.nix
../2configs/git.nix
../2configs/mail-client.nix
../2configs/pulse.nix
@@ -135,9 +135,6 @@ with lib;
};
}
{
- krebs.exim-retiolum.enable = true;
- }
- {
krebs.nginx = {
enable = true;
servers.default.locations = [
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index e6894b55e..12c115eb8 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -5,12 +5,9 @@ with lib;
{
krebs.build.host = config.krebs.hosts.xu;
- krebs.build.source.git.nixpkgs.rev =
- "7ae05edcdd14f6ace83ead9bf0d114e97c89a83a";
-
imports = [
../2configs/hw/x220.nix
- #../2configs/consul-client.nix
+ ../2configs/exim-retiolum.nix
../2configs/git.nix
../2configs/mail-client.nix
../2configs/pulse.nix
@@ -136,9 +133,6 @@ with lib;
};
}
{
- krebs.exim-retiolum.enable = true;
- }
- {
krebs.nginx = {
enable = true;
servers.default.locations = [
diff --git a/tv/2configs/exim-retiolum.nix b/tv/2configs/exim-retiolum.nix
new file mode 100644
index 000000000..1af72c28f
--- /dev/null
+++ b/tv/2configs/exim-retiolum.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+ krebs.exim-retiolum.enable = true;
+}