Merge fort-nix/nix-bitcoin#512: Remove bitcoind banlist

8dc4858872 bitcoind: remove banlist loader (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  nixbitcoin:
    ACK 8dc4858872
  jonasnick:
    ACK 8dc4858872

Tree-SHA512: a3002863b1bcf97f2553d977006bffe0d0554df4d27f6a50898e9dc3a200a5a95878ba2038d5a32d8c3e54ced7a1bf6a8735e954b496fecb20af42637844329e
This commit is contained in:
Jonas Nick 2022-07-17 19:57:45 +00:00
commit 7a40c39d5c
No known key found for this signature in database
GPG key ID: 4861DBF262123605
6 changed files with 4 additions and 3885 deletions

File diff suppressed because it is too large Load diff

View file

@ -428,31 +428,6 @@ in {
// optionalAttrs zmqServerEnabled nbLib.allowNetlink;
};
# Use this to update the banlist:
# wget https://people.xiph.org/~greg/banlist.cli.txt
systemd.services.bitcoind-import-banlist = {
description = "Bitcoin daemon banlist importer";
wantedBy = [ "bitcoind.service" ];
bindsTo = [ "bitcoind.service" ];
after = [ "bitcoind.service" ];
script = ''
cd ${cfg.cli}/bin
echo "Importing node banlist..."
cat ${./banlist.cli.txt} | while read line; do
if ! err=$(eval "$line" 2>&1) && [[ $err != *already\ banned* ]]; then
# unexpected error
echo "$err"
exit 1
fi
done
'';
serviceConfig = nbLib.defaultHardening // {
User = cfg.user;
Group = cfg.group;
ReadWritePaths = [ cfg.dataDir ];
} // nbLib.allowLocalIPAddresses;
};
users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;

View file

@ -303,7 +303,6 @@ in {
netns.bitcoind.address
] ++ map (n: netns.${n}.address) netns.bitcoind.availableNetns;
};
systemd.services.bitcoind-import-banlist.serviceConfig.NetworkNamespacePath = "/var/run/netns/nb-bitcoind";
services.clightning.address = netns.clightning.address;