puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix SSHStore

Browse source
This commit is contained in:
Eelco Dolstra 2023-03-23 09:35:35 +01:00
parent b134546f08
commit 80f0b8d307
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/legacy-ssh-store.cc
View file

@ -17,6 +17,9 @@ struct LegacySSHStoreConfig : virtual CommonSSHStoreConfig
{ {
using CommonSSHStoreConfig::CommonSSHStoreConfig; using CommonSSHStoreConfig::CommonSSHStoreConfig;
const Setting<Path> remoteProgram{(StoreConfig*) this, "nix-store", "remote-program",
"Path to the `nix-store` executable on the remote machine."};
const Setting<int> maxConnections{(StoreConfig*) this, 1, "max-connections", const Setting<int> maxConnections{(StoreConfig*) this, 1, "max-connections",
"Maximum number of concurrent SSH connections."}; "Maximum number of concurrent SSH connections."};

3
src/libstore/ssh-store-config.hh
View file

@ -15,9 +15,6 @@ struct CommonSSHStoreConfig : virtual StoreConfig
const Setting<bool> compress{(StoreConfig*) this, false, "compress", const Setting<bool> compress{(StoreConfig*) this, false, "compress",
"Whether to enable SSH compression."}; "Whether to enable SSH compression."};
const Setting<Path> remoteProgram{(StoreConfig*) this, "nix-store", "remote-program",
"Path to the `nix-store` executable on the remote machine."};
const Setting<std::string> remoteStore{(StoreConfig*) this, "", "remote-store", const Setting<std::string> remoteStore{(StoreConfig*) this, "", "remote-store",
R"( R"(
[Store URL](@docroot@/command-ref/new-cli/nix3-help-stores.md#store-url-format) [Store URL](@docroot@/command-ref/new-cli/nix3-help-stores.md#store-url-format)

3
src/libstore/ssh-store.cc
View file

@ -14,6 +14,9 @@ struct SSHStoreConfig : virtual RemoteStoreConfig, virtual CommonSSHStoreConfig
using RemoteStoreConfig::RemoteStoreConfig; using RemoteStoreConfig::RemoteStoreConfig;
using CommonSSHStoreConfig::CommonSSHStoreConfig; using CommonSSHStoreConfig::CommonSSHStoreConfig;
const Setting<Path> remoteProgram{(StoreConfig*) this, "nix-daemon", "remote-program",
"Path to the `nix-daemon` executable on the remote machine."};
const std::string name() override { return "Experimental SSH Store"; } const std::string name() override { return "Experimental SSH Store"; }
std::string doc() override std::string doc() override