mirror of
https://github.com/gensokyo-zone/infrastructure.git
synced 2026-02-09 20:39:18 -08:00
services/glauth: typo fixes
This commit is contained in:
parent
97b48b9701
commit
74cc1b074b
3 changed files with 10 additions and 9 deletions
|
|
@ -4,6 +4,7 @@
|
|||
profiles.hardware.oracle.ubuntu
|
||||
services.nginx
|
||||
services.keycloak
|
||||
services.glauth
|
||||
];
|
||||
|
||||
kw.oci = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ config, pkgs, lib, ... }: with lib; let
|
||||
cfg = options.services.glauth;
|
||||
dbcfg = options.services.glauth.database;
|
||||
cfg = config.services.glauth;
|
||||
dbcfg = config.services.glauth.database;
|
||||
in
|
||||
{
|
||||
options.services.glauth = {
|
||||
|
|
@ -9,12 +9,12 @@ in
|
|||
type = types.package;
|
||||
default = pkgs.glauth;
|
||||
};
|
||||
outTOML = {
|
||||
outTOML = mkOption {
|
||||
description = "The TOML produced from cfg.settings";
|
||||
type = type.str;
|
||||
type = types.str;
|
||||
default = toTOML cfg.settings;
|
||||
};
|
||||
configFile = {
|
||||
configFile = mkOption {
|
||||
description = "The config path that GLAuth uses";
|
||||
type = types.path;
|
||||
default = pkgs.writeText "glauth-config" cfg.outTOML;
|
||||
|
|
@ -63,7 +63,7 @@ in
|
|||
datastore = "plugin";
|
||||
plugin = "bin/${cfg.database.type}.so";
|
||||
pluginhandler = pluginHandlers.${dbcfg.type};
|
||||
database = if dbcfg.type != "sqlite" then (builtins.replaceStrings (singleton "\n") (singleton " ") ''
|
||||
database = if (dbcfg.type != "sqlite") then (builtins.replaceStrings (singleton "\n") (singleton " ") ''
|
||||
host=${dbcfg.host}
|
||||
port=${dbcfg.port}
|
||||
dbname=glauth
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
};
|
||||
|
||||
kw.secrets.variables = mapListToAttrs (field:
|
||||
nameValuePair = "glauth-${field}" {
|
||||
nameValuePair "glauth-${field}" {
|
||||
path = "services/glauth";
|
||||
inherit field;
|
||||
}) ["password-hash" "postgres"];
|
||||
|
|
@ -48,9 +48,9 @@
|
|||
group = "glauth";
|
||||
};
|
||||
glauth-config-file = {
|
||||
text = services.glauth.outTOML;
|
||||
text = config.services.glauth.outTOML;
|
||||
owner = "glauth";
|
||||
group = "glauth";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue