summaryrefslogtreecommitdiffstats
path: root/1systems
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-07-24 17:34:08 +0200
committertv <tv@shackspace.de>2015-07-24 17:34:08 +0200
commitf1ebbc73395e733e222b7f51e3fb554579ec1916 (patch)
treeb3fa8c5d6279248391f5cd72f92e9bece13e4470 /1systems
parentfaf5f6c172d6a6915e18cdec85e3543051eb0449 (diff)
autoimport 3*/{krebs,$(LOGNAME)}
Diffstat (limited to '1systems')
-rw-r--r--1systems/tv/cd.nix12
-rw-r--r--1systems/tv/mkdir.nix2
-rw-r--r--1systems/tv/nomic.nix3
-rw-r--r--1systems/tv/rmdir.nix2
-rw-r--r--1systems/tv/wu.nix6
5 files changed, 1 insertions, 24 deletions
diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index bf556e017..b15b1897e 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.nix
@@ -22,14 +22,12 @@ in
};
}
{
- imports = [ ../../3modules/tv/ejabberd.nix ];
tv.ejabberd = {
enable = true;
hosts = [ "jabber.viljetic.de" ];
};
}
{
- imports = [ ../../3modules/krebs/github-hosts-sync.nix ];
krebs.github-hosts-sync.enable = true;
tv.iptables.input-internet-accept-new-tcp =
singleton config.krebs.github-hosts-sync.port;
@@ -39,7 +37,6 @@ in
tv.identity.self = config.tv.identity.hosts.cd;
}
{
- imports = [ ../../3modules/tv/iptables.nix ];
tv.iptables = {
enable = true;
input-internet-accept-new-tcp = [
@@ -55,19 +52,11 @@ in
};
}
{
- imports = [
- ../../3modules/tv/iptables.nix
- ../../3modules/krebs/nginx.nix
- ];
tv.iptables.input-internet-accept-new-tcp = singleton "http";
krebs.nginx.servers.cgit.server-names = singleton "cgit.cd.viljetic.de";
}
{
# TODO make public_html also available to cd, cd.retiolum (AKA default)
- imports = [
- ../../3modules/tv/iptables.nix
- ../../3modules/krebs/nginx.nix
- ];
tv.iptables.input-internet-accept-new-tcp = singleton "http";
krebs.nginx.servers.public_html = {
server-names = singleton "cd.viljetic.de";
@@ -86,7 +75,6 @@ in
};
}
{
- imports = [ ../../3modules/krebs/retiolum.nix ];
krebs.retiolum = {
enable = true;
connectTo = [
diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix
index 823f04430..03d0c00f1 100644
--- a/1systems/tv/mkdir.nix
+++ b/1systems/tv/mkdir.nix
@@ -15,7 +15,6 @@ with lib;
tv.identity.self = config.tv.identity.hosts.mkdir;
}
{
- imports = [ ../../3modules/tv/iptables.nix ];
tv.iptables = {
enable = true;
input-internet-accept-new-tcp = [
@@ -29,7 +28,6 @@ with lib;
};
}
{
- imports = [ ../../3modules/krebs/retiolum.nix ];
krebs.retiolum = {
enable = true;
connectTo = [
diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix
index ef4a5ca34..367502eed 100644
--- a/1systems/tv/nomic.nix
+++ b/1systems/tv/nomic.nix
@@ -14,7 +14,6 @@ with lib;
tv.identity.self = config.tv.identity.hosts.nomic;
}
{
- imports = [ ../../3modules/tv/iptables.nix ];
tv.iptables = {
enable = true;
input-internet-accept-new-tcp = [
@@ -26,7 +25,6 @@ with lib;
};
}
{
- imports = [ ../../3modules/krebs/nginx.nix ];
krebs.nginx = {
enable = true;
servers.default.locations = [
@@ -37,7 +35,6 @@ with lib;
};
}
{
- imports = [ ../../3modules/krebs/retiolum.nix ];
krebs.retiolum = {
enable = true;
connectTo = [
diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix
index f15c7902b..497354e68 100644
--- a/1systems/tv/rmdir.nix
+++ b/1systems/tv/rmdir.nix
@@ -15,7 +15,6 @@ with lib;
tv.identity.self = config.tv.identity.hosts.rmdir;
}
{
- imports = [ ../../3modules/tv/iptables.nix ];
tv.iptables = {
enable = true;
input-internet-accept-new-tcp = [
@@ -29,7 +28,6 @@ with lib;
};
}
{
- imports = [ ../../3modules/krebs/retiolum.nix ];
krebs.retiolum = {
enable = true;
connectTo = [
diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 0b5b8289b..8470a4f23 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -24,7 +24,7 @@ in
{
environment.systemPackages = with pkgs; [
- # shitment
+ # stockholm
git
gnumake
parallel
@@ -122,7 +122,6 @@ in
];
}
{
- imports = [ ../../3modules/tv/iptables.nix ];
tv.iptables = {
enable = true;
input-internet-accept-new-tcp = [
@@ -134,7 +133,6 @@ in
};
}
{
- imports = [ ../../3modules/krebs/nginx.nix ];
krebs.nginx = {
enable = true;
servers.default.locations = [
@@ -145,7 +143,6 @@ in
};
}
{
- imports = [ ../../3modules/krebs/retiolum.nix ];
krebs.retiolum = {
enable = true;
connectTo = [
@@ -155,7 +152,6 @@ in
};
}
{
- imports = [ ../../3modules/krebs/urlwatch.nix ];
krebs.urlwatch = {
enable = true;
mailto = "tv@wu.retiolum"; # TODO