summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2021-11-26 14:13:30 +0100
committermakefu <github@syntax-fehler.de>2021-11-26 14:13:30 +0100
commit13c525e54862f0989eea2e4606a68c98e6b49b79 (patch)
treedadf8d91f8a1b5e0138c457d7cf25f637cecbb48
parent463dc7ea67a3eb0c327dcffb6457581778c6e6b2 (diff)
parentb8dfd63ba1a141a6ea69db305ca1be99e99ae4e1 (diff)
Merge remote-tracking branch 'mic/master'
-rw-r--r--krebs/3modules/external/mic92.nix2
-rw-r--r--lass/1systems/yellow/config.nix2
-rw-r--r--makefu/2configs/nix-community/supervision.nix1
3 files changed, 2 insertions, 3 deletions
diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix
index e83608385..0e6812a35 100644
--- a/krebs/3modules/external/mic92.nix
+++ b/krebs/3modules/external/mic92.nix
@@ -224,10 +224,8 @@ in {
retiolum = {
via = internet;
addrs = [
- config.krebs.hosts.eve.nets.retiolum.ip4.addr
config.krebs.hosts.eve.nets.retiolum.ip6.addr
];
- ip4.addr = "10.243.29.174";
aliases = [ "eve.r" ];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
diff --git a/lass/1systems/yellow/config.nix b/lass/1systems/yellow/config.nix
index dc3b4b566..554882bf3 100644
--- a/lass/1systems/yellow/config.nix
+++ b/lass/1systems/yellow/config.nix
@@ -21,7 +21,7 @@ with import <stockholm/lib>;
download-dir = "/var/download/finished";
incomplete-dir = "/var/download/incoming";
incomplete-dir-enable = true;
- rpc-bind-address = "0.0.0.0";
+ rpc-bind-address = "::";
message-level = 1;
umask = 18;
rpc-whitelist-enabled = false;
diff --git a/makefu/2configs/nix-community/supervision.nix b/makefu/2configs/nix-community/supervision.nix
index f648b9c17..cd4b6567b 100644
--- a/makefu/2configs/nix-community/supervision.nix
+++ b/makefu/2configs/nix-community/supervision.nix
@@ -6,6 +6,7 @@ in {
networking.firewall.extraCommands = ''
iptables -A INPUT -i retiolum -p tcp --dport ${port} -j ACCEPT
+ ip6tables -A INPUT -i retiolum -p tcp --dport ${port} -j ACCEPT
'';
services.telegraf = {