maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move some options out of globals

Browse source
This commit is contained in:
Eelco Dolstra 2014-08-04 18:13:14 +02:00
parent daccd68999
commit 988bf59421
4 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/download-via-ssh/download-via-ssh.cc
View file

@ -103,7 +103,7 @@ void run(Strings args)
/* Pass on the location of the daemon client's SSH authentication /* Pass on the location of the daemon client's SSH authentication
socket. */ socket. */
string sshAuthSock = settings.get("ssh-auth-sock"); string sshAuthSock = settings.get("ssh-auth-sock", "");
if (sshAuthSock != "") setenv("SSH_AUTH_SOCK", sshAuthSock.c_str(), 1); if (sshAuthSock != "") setenv("SSH_AUTH_SOCK", sshAuthSock.c_str(), 1);
string host = settings.sshSubstituterHosts.front(); string host = settings.sshSubstituterHosts.front();

12
src/libstore/globals.cc
View file

@ -63,8 +63,6 @@ Settings::Settings()
lockCPU = getEnv("NIX_AFFINITY_HACK", "1") == "1"; lockCPU = getEnv("NIX_AFFINITY_HACK", "1") == "1";
showTrace = false; showTrace = false;
enableImportNative = false; enableImportNative = false;
trustedUsers = Strings({"root"});
allowedUsers = Strings({"*"});
} }
@ -130,6 +128,14 @@ string Settings::get(const string & name, const string & def)
} }
Strings Settings::get(const string & name, const Strings & def)
{
auto i = settings.find(name);
if (i == settings.end()) return def;
return tokenizeString<Strings>(i->second);
}
void Settings::update() void Settings::update()
{ {
_get(tryFallback, "build-fallback"); _get(tryFallback, "build-fallback");
@ -161,8 +167,6 @@ void Settings::update()
_get(logServers, "log-servers"); _get(logServers, "log-servers");
_get(enableImportNative, "allow-unsafe-native-code-during-evaluation"); _get(enableImportNative, "allow-unsafe-native-code-during-evaluation");
_get(useCaseHack, "use-case-hack"); _get(useCaseHack, "use-case-hack");
_get(trustedUsers, "trusted-users");
_get(allowedUsers, "allowed-users");
string subs = getEnv("NIX_SUBSTITUTERS", "default"); string subs = getEnv("NIX_SUBSTITUTERS", "default");
if (subs == "default") { if (subs == "default") {

4
src/libstore/globals.hh
View file

@ -21,7 +21,9 @@ struct Settings {
void set(const string & name, const string & value); void set(const string & name, const string & value);
string get(const string & name, const string & def = ""); string get(const string & name, const string & def);
Strings get(const string & name, const Strings & def);
void update(); void update();

3
src/nix-daemon/nix-daemon.cc
View file

@ -743,6 +743,9 @@ static void daemonLoop()
struct group * gr = getgrgid(cred.gid); struct group * gr = getgrgid(cred.gid);
string group = gr ? gr->gr_name : int2String(cred.gid); string group = gr ? gr->gr_name : int2String(cred.gid);
Strings trustedUsers = settings.get("trusted-users", Strings({"root"}));
Strings allowedUsers = settings.get("allowed-users", Strings({"*"}));
if (matchUser(user, group, settings.trustedUsers)) if (matchUser(user, group, settings.trustedUsers))
trusted = true; trusted = true;