public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86242 from lordcirth/ipfs05

Browse Source
This commit is contained in:
Jörg Thalheim 2020-05-08 10:51:21 +01:00 committed by GitHub
commit ddef88772e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/network-filesystems/ipfs.nix
View File

@ -37,9 +37,7 @@ let
baseService = recursiveUpdate commonEnv { baseService = recursiveUpdate commonEnv {
wants = [ "ipfs-init.service" ]; wants = [ "ipfs-init.service" ];
# NB: migration must be performed prior to pre-start, else we get the failure message! # NB: migration must be performed prior to pre-start, else we get the failure message!
preStart = '' preStart = optionalString cfg.autoMount ''
ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214)
'' + optionalString cfg.autoMount ''
ipfs --local config Mounts.FuseAllowOther --json true ipfs --local config Mounts.FuseAllowOther --json true
ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir} ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir}
ipfs --local config Mounts.IPNS ${cfg.ipnsMountDir} ipfs --local config Mounts.IPNS ${cfg.ipnsMountDir}

1
nixos/tests/all-tests.nix
View File

@ -143,6 +143,7 @@ in
initrdNetwork = handleTest ./initrd-network.nix {}; initrdNetwork = handleTest ./initrd-network.nix {};
installer = handleTest ./installer.nix {}; installer = handleTest ./installer.nix {};
iodine = handleTest ./iodine.nix {}; iodine = handleTest ./iodine.nix {};
ipfs = handleTest ./ipfs.nix {};
ipv6 = handleTest ./ipv6.nix {}; ipv6 = handleTest ./ipv6.nix {};
jackett = handleTest ./jackett.nix {}; jackett = handleTest ./jackett.nix {};
jellyfin = handleTest ./jellyfin.nix {}; jellyfin = handleTest ./jellyfin.nix {};

58
nixos/tests/ipfs.nix
View File

@ -1,55 +1,25 @@
import ./make-test-python.nix ({ pkgs, ...} : {
import ./make-test.nix ({ pkgs, ...} : {
name = "ipfs"; name = "ipfs";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ mguentner ]; maintainers = [ mguentner ];
}; };
nodes = { nodes.machine = { ... }: {
adder = services.ipfs = {
{ ... }: enable = true;
{ apiAddress = "/ip4/127.0.0.1/tcp/2324";
services.ipfs = { };
enable = true;
defaultMode = "norouting";
gatewayAddress = "/ip4/127.0.0.1/tcp/2323";
apiAddress = "/ip4/127.0.0.1/tcp/2324";
};
networking.firewall.allowedTCPPorts = [ 4001 ];
};
getter =
{ ... }:
{
services.ipfs = {
enable = true;
defaultMode = "norouting";
autoMount = true;
};
networking.firewall.allowedTCPPorts = [ 4001 ];
};
}; };
testScript = '' testScript = ''
startAll; start_all()
$adder->waitForUnit("ipfs-norouting"); machine.wait_for_unit("ipfs")
$getter->waitForUnit("ipfs-norouting");
# wait until api is available machine.wait_until_succeeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id")
$adder->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id"); ipfs_hash = machine.succeed(
my $addrId = $adder->succeed("ipfs --api /ip4/127.0.0.1/tcp/2324 id -f=\"<id>\""); "echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | awk '{ print $2 }'"
my $addrIp = (split /[ \/]+/, $adder->succeed("ip -o -4 addr show dev eth1"))[3]; )
$adder->mustSucceed("[ -n \"\$(ipfs --api /ip4/127.0.0.1/tcp/2324 config Addresses.Gateway | grep /ip4/127.0.0.1/tcp/2323)\" ]"); machine.succeed(f"ipfs cat /ipfs/{ipfs_hash.strip()} | grep fnord")
'';
# wait until api is available
$getter->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/5001 id");
my $ipfsHash = $adder->mustSucceed("echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | cut -d' ' -f2");
chomp($ipfsHash);
$adder->mustSucceed("[ -n \"\$(echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | grep added)\" ]");
$getter->mustSucceed("ipfs --api /ip4/127.0.0.1/tcp/5001 swarm connect /ip4/$addrIp/tcp/4001/ipfs/$addrId");
$getter->mustSucceed("[ -n \"\$(ipfs --api /ip4/127.0.0.1/tcp/5001 cat /ipfs/$ipfsHash | grep fnord)\" ]");
$getter->mustSucceed("[ -n \"$(cat /ipfs/$ipfsHash | grep fnord)\" ]");
'';
}) })

15
pkgs/applications/networking/ipfs/default.nix
View File

@ -1,22 +1,29 @@
{ stdenv, buildGoModule, fetchFromGitHub }: { stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec { buildGoModule rec {
pname = "ipfs"; pname = "ipfs";
version = "0.4.23"; version = "0.5.0";
rev = "v${version}"; rev = "v${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ipfs"; owner = "ipfs";
repo = "go-ipfs"; repo = "go-ipfs";
inherit rev; inherit rev;
sha256 = "19m1bhqf1jghdv2ngdnjdk1kvjcxbkgm1ccdkmkabv4ii43h8jwm"; sha256 = "0dbyvs49wyqj46c8hvz0fr4vpgfrdj1h8blniwzjf0jabgvw8nik";
}; };
postPatch = '' postPatch = ''
rm -rf test/dependencies rm -rf test/dependencies
patchShebangs plugin/loader/preload.sh
''; '';
modSha256 = "12m4ind1s8zaa6kssblc28z2cafy20w2jp80kzif39hg5ar9bijm"; buildPhase = ''
make install
'';
passthru.tests.ipfs = nixosTests.ipfs;
modSha256 = "00xgsvpl47miy6paxl8yn6p76h6ssccackh50z0l4r5s7wcc25q8";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A global, versioned, peer-to-peer filesystem"; description = "A global, versioned, peer-to-peer filesystem";