clan/clan-infra
10
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'dendrite: update to new postgresql syntax' (#129) from Mic92-main into main
All checks were successful
checks / test (push) Successful in 44s
Details

Browse Source 
Reviewed-on: #129
This commit is contained in:
Mic92 2024-01-02 14:59:15 +00:00
commit e5e55bcca0
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock
View File

@ -131,11 +131,11 @@
}, },
"nixos-stable": { "nixos-stable": {
"locked": { "locked": {
"lastModified": 1703467016, "lastModified": 1703900474,
"narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", "narHash": "sha256-Zu+chYVYG2cQ4FCbhyo6rc5Lu0ktZCjRbSPE0fDgukI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", "rev": "9dd7699928e26c3c00d5d46811f1358524081062",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -201,11 +201,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704017909, "lastModified": 1704204620,
"narHash": "sha256-Eh4Iqcoq5ZcaXXY5+lN8oU9IUrMTktx4EyvmMGWlWP8=", "narHash": "sha256-u7C59X3s706W9ptqfYHLlZlropun5Fzr9eYaKAsEuN8=",
"owner": "numtide", "owner": "numtide",
"repo": "srvos", "repo": "srvos",
"rev": "23c8e6a9ca1365b9c281e2fb609e30932518b9a0", "rev": "e5eecdf21bdf048cef7cb9e52bf573fdf959d491",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
modules/web01/dendrite.nix
View File

@ -125,12 +125,10 @@ in
systemd.services.dendrite.after = [ "postgresql.service" ]; systemd.services.dendrite.after = [ "postgresql.service" ];
services.postgresql = { services.postgresql = {
ensureDatabases = [ "dendrite" ]; ensureDatabases = [ "dendrite" ];
ensureUsers = [ ensureUsers = [{
{
name = "dendrite"; name = "dendrite";
ensurePermissions."DATABASE dendrite" = "ALL PRIVILEGES"; ensureDBOwnership = true;
} }];
];
}; };
services.nginx.virtualHosts.${nginx-vhost} = { services.nginx.virtualHosts.${nginx-vhost} = {