Merge pull request #7984 from rushmorem/marathon-module-update

Make it easy to override the marathon framework user
This commit is contained in:
lethalman 2015-06-01 17:06:50 +02:00
commit 3b6dbb1917

View file

@ -19,14 +19,6 @@ in {
'';
};
httpPort = mkOption {
type = types.int;
default = 8080;
description = ''
Marathon listening port for HTTP connections.
'';
};
master = mkOption {
type = types.str;
default = "zk://${concatStringsSep "," cfg.zookeeperHosts}/mesos";
@ -45,6 +37,25 @@ in {
'';
};
user = mkOption {
type = types.str;
default = "marathon";
example = "root";
description = ''
The user that the Marathon framework will be launched as. If the user doesn't exist it will be created.
If you want to run apps that require root access or you want to launch apps using arbitrary users, that
is using the `--mesos_user` flag then you need to change this to `root`.
'';
};
httpPort = mkOption {
type = types.int;
default = 8080;
description = ''
Marathon listening port for HTTP connections.
'';
};
extraCmdLineOptions = mkOption {
type = types.listOf types.str;
default = [ ];
@ -76,14 +87,12 @@ in {
serviceConfig = {
ExecStart = "${pkgs.marathon}/bin/marathon --master ${cfg.master} --zk zk://${concatStringsSep "," cfg.zookeeperHosts}/marathon --http_port ${toString cfg.httpPort} ${concatStringsSep " " cfg.extraCmdLineOptions}";
User = "marathon";
User = cfg.user;
Restart = "always";
RestartSec = "2";
};
};
users.extraUsers.marathon = {
description = "Marathon mesos framework user";
};
users.extraUsers.${cfg.user} = { };
};
}