Merge remote-tracking branch 'mic/master'

This commit is contained in:
makefu 2021-11-26 14:13:30 +01:00
commit 13c525e548
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
3 changed files with 2 additions and 3 deletions

View File

@ -224,10 +224,8 @@ in {
retiolum = { retiolum = {
via = internet; via = internet;
addrs = [ addrs = [
config.krebs.hosts.eve.nets.retiolum.ip4.addr
config.krebs.hosts.eve.nets.retiolum.ip6.addr config.krebs.hosts.eve.nets.retiolum.ip6.addr
]; ];
ip4.addr = "10.243.29.174";
aliases = [ "eve.r" ]; aliases = [ "eve.r" ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----

View File

@ -21,7 +21,7 @@ with import <stockholm/lib>;
download-dir = "/var/download/finished"; download-dir = "/var/download/finished";
incomplete-dir = "/var/download/incoming"; incomplete-dir = "/var/download/incoming";
incomplete-dir-enable = true; incomplete-dir-enable = true;
rpc-bind-address = "0.0.0.0"; rpc-bind-address = "::";
message-level = 1; message-level = 1;
umask = 18; umask = 18;
rpc-whitelist-enabled = false; rpc-whitelist-enabled = false;

View File

@ -6,6 +6,7 @@ in {
networking.firewall.extraCommands = '' networking.firewall.extraCommands = ''
iptables -A INPUT -i retiolum -p tcp --dport ${port} -j ACCEPT iptables -A INPUT -i retiolum -p tcp --dport ${port} -j ACCEPT
ip6tables -A INPUT -i retiolum -p tcp --dport ${port} -j ACCEPT
''; '';
services.telegraf = { services.telegraf = {