summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-06-01 12:49:21 +0200
committerlassulus <lass@lassul.us>2017-06-01 12:49:21 +0200
commit73b073c3fe037f31e05828a1071c9b4b19f7a2ff (patch)
treeb6ee1d7b8016b55ab61fd0585cb2aba7d993f703 /lass/2configs
parent21d92086fe00c7369fde3951f92e9f73f4c05ee9 (diff)
lass: RIP helios
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/backups.nix24
-rw-r--r--lass/2configs/buildbot-standalone.nix2
-rw-r--r--lass/2configs/downloading.nix1
-rw-r--r--lass/2configs/exim-smarthost.nix1
-rw-r--r--lass/2configs/logf.nix1
5 files changed, 1 insertions, 28 deletions
diff --git a/lass/2configs/backups.nix b/lass/2configs/backups.nix
index 22b48f6e8..b20e15dd9 100644
--- a/lass/2configs/backups.nix
+++ b/lass/2configs/backups.nix
@@ -107,29 +107,5 @@ with import <stockholm/lib>;
dst = { host = config.krebs.hosts.shodan; path = "/bku/mors-home"; };
startAt = "05:00";
};
- dishfire-http-helios = {
- method = "pull";
- src = { host = config.krebs.hosts.dishfire; path = "/srv/http"; };
- dst = { host = config.krebs.hosts.helios; path = "/bku/dishfire-http"; };
- startAt = "12:00";
- };
- dishfire-sql-helios = {
- method = "pull";
- src = { host = config.krebs.hosts.dishfire; path = "/bku/sql_dumps"; };
- dst = { host = config.krebs.hosts.helios; path = "/bku/dishfire-sql"; };
- startAt = "12:15";
- };
- prism-sql-helios = {
- method = "pull";
- src = { host = config.krebs.hosts.prism; path = "/bku/sql_dumps"; };
- dst = { host = config.krebs.hosts.helios; path = "/bku/prism-sql_dumps"; };
- startAt = "12:30";
- };
- prism-http-helios = {
- method = "pull";
- src = { host = config.krebs.hosts.prism; path = "/srv/http"; };
- dst = { host = config.krebs.hosts.helios; path = "/bku/prism-http"; };
- startAt = "12:45";
- };
};
}
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index 62b823c3f..227152482 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -113,7 +113,7 @@ in {
]
)
- for i in [ "mors", "uriel", "shodan", "helios", "icarus", "cloudkrebs", "echelon", "dishfire", "prism" ]:
+ for i in [ "mors", "uriel", "shodan", "icarus", "cloudkrebs", "echelon", "dishfire", "prism" ]:
addShell(f,name="build-{}".format(i),env=env_lass,
command=nixshell + \
["mkdir -p $HOME/$LOGNAME && touch $HOME/$LOGNAME/.populate; \
diff --git a/lass/2configs/downloading.nix b/lass/2configs/downloading.nix
index eb9575018..d32262810 100644
--- a/lass/2configs/downloading.nix
+++ b/lass/2configs/downloading.nix
@@ -15,7 +15,6 @@ with import <stockholm/lib>;
openssh.authorizedKeys.keys = with config.krebs.users; [
lass.pubkey
lass-shodan.pubkey
- lass-helios.pubkey
lass-icarus.pubkey
makefu.pubkey
];
diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix
index 3353cdac0..b8d00e7d4 100644
--- a/lass/2configs/exim-smarthost.nix
+++ b/lass/2configs/exim-smarthost.nix
@@ -16,7 +16,6 @@ with import <stockholm/lib>;
relay_from_hosts = map (host: host.nets.retiolum.ip6.addr) [
config.krebs.hosts.mors
config.krebs.hosts.uriel
- config.krebs.hosts.helios
];
internet-aliases = with config.krebs.users; [
{ from = "postmaster@lassul.us"; to = lass.mail; } # RFC 822
diff --git a/lass/2configs/logf.nix b/lass/2configs/logf.nix
index 3c4948db1..03414a745 100644
--- a/lass/2configs/logf.nix
+++ b/lass/2configs/logf.nix
@@ -8,7 +8,6 @@ let
shodan = "51";
icarus = "53";
echelon = "197";
- helios = "199";
cloudkrebs = "119";
};
in {