gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

glauth: Further work

Browse source
This commit is contained in:
kat witch 2021-09-04 23:38:04 +01:00
parent 5920dc9595
commit 199be9a7db
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/modules/nixos/glauth.nix
View file

@ -21,7 +21,7 @@ in
}; };
database = { database = {
enable = mkEnableOption "use a database"; enable = mkEnableOption "use a database";
local = mkEnableOption "local database creation"; local = mkEnableOption "local database creation" // { default = true; };
type = mkOption { type = mkOption {
type = types.enum [ type = types.enum [
"postgres" "postgres"
@ -77,7 +77,7 @@ in
}; };
config = config =
let let
localCheck = dbcfg.local && dbcfg.host != "localhost"; localCheck = dbcfg.local && dbcfg.enable && dbcfg.host == "localhost";
postgresCheck = localCheck && dbcfg.type == "postgres"; postgresCheck = localCheck && dbcfg.type == "postgres";
mysqlCheck = localCheck && dbcfg.type == "mysql"; mysqlCheck = localCheck && dbcfg.type == "mysql";
in in
@ -173,4 +173,6 @@ in
}; };
}; };
}; };
meta.maintainers = with maintainers; [ kittywitch ];
} }

1
config/services/glauth/default.nix
View file

@ -4,6 +4,7 @@
configFile = config.secrets.files.glauth-config-file.path; configFile = config.secrets.files.glauth-config-file.path;
database = { database = {
enable = true; enable = true;
local = true;
type = "postgres"; type = "postgres";
passwordFile = config.secrets.files.glauth-postgres-file.path; passwordFile = config.secrets.files.glauth-postgres-file.path;
}; };

6
nix/sources.json
View file

@ -89,10 +89,10 @@
"homepage": null, "homepage": null,
"owner": "kittywitch", "owner": "kittywitch",
"repo": "nixexprs", "repo": "nixexprs",
"rev": "90f41efe41ef038648a9b7bb3c86f82a94faec98", "rev": "2abdd7cea2cbd4ce229827ad71b6479d0eb4b85e",
"sha256": "125msdla0kk7jswcxyvbslwdl76v5dmpx3jb4i0psvxafyhr6zbx", "sha256": "0ifsm74l490zw6qwy75sw5r9fsl02pq17ckcmi384m37hk95724v",
"type": "tarball", "type": "tarball",
"url": "https://github.com/kittywitch/nixexprs/archive/90f41efe41ef038648a9b7bb3c86f82a94faec98.tar.gz", "url": "https://github.com/kittywitch/nixexprs/archive/2abdd7cea2cbd4ce229827ad71b6479d0eb4b85e.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"niv": { "niv": {

2
overlays/exprs

@ -1 +1 @@
Subproject commit 90f41efe41ef038648a9b7bb3c86f82a94faec98 Subproject commit 2abdd7cea2cbd4ce229827ad71b6479d0eb4b85e