fixer tous les things

This commit is contained in:
hexchen 2022-01-27 20:20:25 +00:00
parent 9937d5ff94
commit 6de0b91beb
5 changed files with 13 additions and 7 deletions

View file

@ -23,7 +23,7 @@
"homepage": "https://mattermost.com", "homepage": "https://mattermost.com",
"owner": "mattermost", "owner": "mattermost",
"repo": "mattermost-server", "repo": "mattermost-server",
"rev": "3172adfce9d98fe8f9c98ccd0a0fdbb52291ae0a", "rev": "8f352436049776b5bd7c006bb03992d8fe2f029f",
"sha256": "1sy0kydp87pwby0whgq678jq1zpivqndip81787r9b3dqcyq47cp", "sha256": "1sy0kydp87pwby0whgq678jq1zpivqndip81787r9b3dqcyq47cp",
"type": "tarball", "type": "tarball",
"url": "https://github.com/mattermost/mattermost-server/archive/refs/tags/v6.1.2.tar.gz", "url": "https://github.com/mattermost/mattermost-server/archive/refs/tags/v6.1.2.tar.gz",
@ -75,10 +75,10 @@
"homepage": "", "homepage": "",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8a053bc2255659c5ca52706b9e12e76a8f50dbdd", "rev": "6c4b9f1a2fd761e2d384ef86cff0d208ca27fdca",
"sha256": "087lqvl8icvwzk61a0sn87m48a7bmm1bhna3v61w12ad97an9shj", "sha256": "1yl5gj0mzczhl1j8sl8iqpwa1jzsgr12fdszw9rq13cdig2a2r5f",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nixos/nixpkgs/archive/8a053bc2255659c5ca52706b9e12e76a8f50dbdd.tar.gz", "url": "https://github.com/nixos/nixpkgs/archive/6c4b9f1a2fd761e2d384ef86cff0d208ca27fdca.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
@ -87,10 +87,10 @@
"homepage": "", "homepage": "",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5b091d4fbe3b7b7493c3b46fe0842e4b30ea24b3", "rev": "945ec499041db73043f745fad3b2a3a01e826081",
"sha256": "0yb7l5p4k9q8avwiq0fgp87ij50d6yavgh4dfw14jh2lf8daqbmp", "sha256": "1ixv310sjw0r5vda4yfwp3snyha2i9h7aqygd43cyvdk2qsjk8pq",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nixos/nixpkgs/archive/5b091d4fbe3b7b7493c3b46fe0842e4b30ea24b3.tar.gz", "url": "https://github.com/nixos/nixpkgs/archive/945ec499041db73043f745fad3b2a3a01e826081.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"workadventure": { "workadventure": {

View file

@ -44,6 +44,7 @@
allowOrigin = [ "localhost" "pad.hacc.space" "fff-muc.de" ]; allowOrigin = [ "localhost" "pad.hacc.space" "fff-muc.de" ];
db = { db = {
host = "/run/postgresql"; host = "/run/postgresql";
username = "codimd";
dialect = "postgres"; dialect = "postgres";
database = "codimd"; database = "codimd";
}; };
@ -80,7 +81,9 @@
}]; }];
authentication = '' authentication = ''
local all all trust local all all trust
host codimd codimd 127.0.0.1/32 trust
''; '';
package = pkgs.postgresql_11;
}; };
services.postgresqlBackup = { services.postgresqlBackup = {
enable = true; enable = true;

View file

@ -60,6 +60,7 @@
}; };
services.postgresql = { services.postgresql = {
enable = true; enable = true;
package = pkgs.postgresql_11;
authentication = '' authentication = ''
local all all trust local all all trust
host hedgedoc hedgedoc 127.0.0.1/32 trust host hedgedoc hedgedoc 127.0.0.1/32 trust

View file

@ -202,6 +202,7 @@ in {
services.postgresql = { services.postgresql = {
enable = lib.mkForce true; # mattermost sets this to false. wtf. enable = lib.mkForce true; # mattermost sets this to false. wtf.
package = pkgs.postgresql_11;
ensureDatabases = [ "mattermost" ]; ensureDatabases = [ "mattermost" ];
ensureUsers = [ { ensureUsers = [ {
name = "mattermost"; name = "mattermost";

View file

@ -102,6 +102,7 @@
services.postgresql = { services.postgresql = {
enable = true; enable = true;
package = pkgs.postgresql_11;
ensureDatabases = [ "nextcloud" ]; ensureDatabases = [ "nextcloud" ];
ensureUsers = [ ensureUsers = [
{ # by default, postgres has unix sockets enabled, and allows a { # by default, postgres has unix sockets enabled, and allows a