Merge pull request #264808 from gmemstr/coder-environment
nixos/coder: add environment.extra and environment.file
This commit is contained in:
commit
787dcb7ce8
|
@ -72,6 +72,23 @@ in {
|
||||||
example = "*.coder.example.com";
|
example = "*.coder.example.com";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
environment = {
|
||||||
|
extra = mkOption {
|
||||||
|
type = types.attrs;
|
||||||
|
description = lib.mdDoc "Extra environment variables to pass run Coder's server with. See Coder documentation.";
|
||||||
|
default = {};
|
||||||
|
example = {
|
||||||
|
CODER_OAUTH2_GITHUB_ALLOW_SIGNUPS = true;
|
||||||
|
CODER_OAUTH2_GITHUB_ALLOWED_ORGS = "your-org";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
file = mkOption {
|
||||||
|
type = types.nullOr types.path;
|
||||||
|
description = lib.mdDoc "Systemd environment file to add to Coder.";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
database = {
|
database = {
|
||||||
createLocally = mkOption {
|
createLocally = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
|
@ -152,7 +169,7 @@ in {
|
||||||
after = [ "network.target" ];
|
after = [ "network.target" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
||||||
environment = {
|
environment = config.environment.extra // {
|
||||||
CODER_ACCESS_URL = cfg.accessUrl;
|
CODER_ACCESS_URL = cfg.accessUrl;
|
||||||
CODER_WILDCARD_ACCESS_URL = cfg.wildcardAccessUrl;
|
CODER_WILDCARD_ACCESS_URL = cfg.wildcardAccessUrl;
|
||||||
CODER_PG_CONNECTION_URL = "user=${cfg.database.username} ${optionalString (cfg.database.password != null) "password=${cfg.database.password}"} database=${cfg.database.database} host=${cfg.database.host} ${optionalString (cfg.database.sslmode != null) "sslmode=${cfg.database.sslmode}"}";
|
CODER_PG_CONNECTION_URL = "user=${cfg.database.username} ${optionalString (cfg.database.password != null) "password=${cfg.database.password}"} database=${cfg.database.database} host=${cfg.database.host} ${optionalString (cfg.database.sslmode != null) "sslmode=${cfg.database.sslmode}"}";
|
||||||
|
@ -177,6 +194,7 @@ in {
|
||||||
ExecStart = "${cfg.package}/bin/coder server";
|
ExecStart = "${cfg.package}/bin/coder server";
|
||||||
User = cfg.user;
|
User = cfg.user;
|
||||||
Group = cfg.group;
|
Group = cfg.group;
|
||||||
|
EnvironmentFile = lib.mkIf (cfg.environment.file != null) cfg.environment.file;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user