3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-03 19:31:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

configurable user and group

Browse source
This commit is contained in:
badaix 2017-02-26 22:29:06 +01:00
parent f103788398
commit ed1c5d6606
4 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/snapClient.cpp
View file

@ -88,6 +88,7 @@ int main (int argc, char **argv)
Implicit<int> daemonOption("d", "daemon", "daemonize, optional process priority [-20..19]", -3, &processPriority); Implicit<int> daemonOption("d", "daemon", "daemonize, optional process priority [-20..19]", -3, &processPriority);
Value<int> latencyValue("", "latency", "latency of the soundcard", 0, &latency); Value<int> latencyValue("", "latency", "latency of the soundcard", 0, &latency);
Value<size_t> instanceValue("i", "instance", "instance id", 1, &instance); Value<size_t> instanceValue("i", "instance", "instance id", 1, &instance);
Value<string> userValue("", "user", "the user[:group] to run snapclient as when daemonized", "snapclient:audio");
OptionParser op("Allowed options"); OptionParser op("Allowed options");
op.add(helpSwitch) op.add(helpSwitch)
@ -100,6 +101,7 @@ int main (int argc, char **argv)
#endif #endif
#ifdef HAS_DAEMON #ifdef HAS_DAEMON
.add(daemonOption) .add(daemonOption)
.add(userValue)
#endif #endif
.add(latencyValue) .add(latencyValue)
.add(instanceValue); .add(instanceValue);
@ -163,7 +165,14 @@ int main (int argc, char **argv)
string pidFile = "/var/run/snapclient/pid"; string pidFile = "/var/run/snapclient/pid";
if (instance != 1) if (instance != 1)
pidFile += "." + cpt::to_string(instance); pidFile += "." + cpt::to_string(instance);
daemonize("snapclient", "audio", pidFile);
if (userValue.getValue().empty())
std::invalid_argument("user must not be empty");
vector<string> user_group = split(userValue.getValue(), ':');
string user = user_group[0];
string group = (user_group.size() == 1)?user_group[0]:user_group[1];
daemonize(user, group, pidFile);
if (processPriority < -20) if (processPriority < -20)
processPriority = -20; processPriority = -20;
else if (processPriority > 19) else if (processPriority > 19)

2
openWrt/snapclient.init
View file

@ -9,7 +9,7 @@ SERVICE_PID_FILE=/var/run/$SERVICE_NAME/pid
DESC="Snapcast client" DESC="Snapcast client"
DAEMON=/usr/bin/$SERVICE_NAME DAEMON=/usr/bin/$SERVICE_NAME
SNAPCLIENT_OPTS="-d" SNAPCLIENT_OPTS="-d --user root"
# Exit if the package is not installed # Exit if the package is not installed

2
openWrt/snapserver.init
View file

@ -9,7 +9,7 @@ SERVICE_PID_FILE=/var/run/$SERVICE_NAME/pid
DESC="Snapcast server" DESC="Snapcast server"
DAEMON=/usr/bin/$SERVICE_NAME DAEMON=/usr/bin/$SERVICE_NAME
SNAPSERVER_OPTS="-d" SNAPSERVER_OPTS="-d --user root"
# Exit if the package is not installed # Exit if the package is not installed

10
server/snapServer.cpp
View file

@ -68,6 +68,7 @@ int main(int argc, char* argv[])
Value<int> bufferValue("b", "buffer", "Buffer [ms]", settings.bufferMs, &settings.bufferMs); Value<int> bufferValue("b", "buffer", "Buffer [ms]", settings.bufferMs, &settings.bufferMs);
Implicit<int> daemonOption("d", "daemon", "Daemonize\noptional process priority [-20..19]", 0, &processPriority); Implicit<int> daemonOption("d", "daemon", "Daemonize\noptional process priority [-20..19]", 0, &processPriority);
Value<string> userValue("", "user", "the user[:group] to run snapserver as when daemonized", "snapserver:snapserver");
OptionParser op("Allowed options"); OptionParser op("Allowed options");
op.add(helpSwitch) op.add(helpSwitch)
@ -81,6 +82,7 @@ int main(int argc, char* argv[])
.add(bufferValue) .add(bufferValue)
#ifdef HAS_DAEMON #ifdef HAS_DAEMON
.add(daemonOption) .add(daemonOption)
.add(userValue)
#endif #endif
; ;
@ -144,7 +146,13 @@ int main(int argc, char* argv[])
if (daemonOption.isSet()) if (daemonOption.isSet())
{ {
#ifdef HAS_DAEMON #ifdef HAS_DAEMON
daemonize("snapserver", "snapserver", "/var/run/snapserver/pid"); if (userValue.getValue().empty())
std::invalid_argument("user must not be empty");
vector<string> user_group = split(userValue.getValue(), ':');
string user = user_group[0];
string group = (user_group.size() == 1)?user_group[0]:user_group[1];
daemonize(user, group, "/var/run/snapserver/pid");
if (processPriority < -20) if (processPriority < -20)
processPriority = -20; processPriority = -20;
else if (processPriority > 19) else if (processPriority > 19)