From 2f83341de0d298561191abab5d55044a024b010e Mon Sep 17 00:00:00 2001 From: James Walker Date: Sat, 8 Apr 2023 15:49:43 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20akkoma=20postgres=20config=20upd?= =?UTF-8?q?ate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 78 +++++++++++++++++++------------------- modules/akkoma/default.nix | 14 ++++++- 2 files changed, 52 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index 7baf43a..2b5c43d 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1680266963, + "narHash": "sha256-IW/lzbUCOcldLHWHjNSg1YoViDnZOmz0ZJL7EH9OkV8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "99d4187d11be86b49baa3a1aec0530004072374f", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1679700890, - "narHash": "sha256-u8GqQF/z57LaDf5x/O3IC5qtvwwhLtak+kWosp51F2w=", + "lastModified": 1680782537, + "narHash": "sha256-oQQoEzpuo4fjyPNCu3/Tc+f8hPAvvuoy4bIo9hn7akg=", "owner": "cachix", "repo": "devenv", - "rev": "c9ff5bd489ca36a526e46440fec4d10a87988363", + "rev": "e639583e5974e1d0f58ac110356f7f182d6f6004", "type": "github" }, "original": { @@ -264,11 +264,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1679345933, - "narHash": "sha256-bZVohybatVr/rH5H57QYblsYOLC46Gn2mfHiSk/PNNs=", + "lastModified": 1680911728, + "narHash": "sha256-ft51AU1x7iZ/4DgXSf1pcw8FGEqwyzFZ2RGZDOo5ERE=", "owner": "fission-codes", "repo": "nix-overlay", - "rev": "589ff631a13de58b6a06b1d573eb72c135cc14a4", + "rev": "858aa6388db5a4a54dc71074dc301f134c7e897a", "type": "github" }, "original": { @@ -509,11 +509,11 @@ }, "flake-utils_7": { "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1680946745, + "narHash": "sha256-KqGlwg9UTDsFBZZB8wzXgMnc8XQm95LtSbFvBsnqkPI=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "946da791763db1c306b86a8bd3828bf5814a1247", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1679786039, - "narHash": "sha256-VNjswu0Q4bZOkWNuc0+dHvRdjUCj+MnDlRfw/Q0R3vI=", + "lastModified": 1680667162, + "narHash": "sha256-2vgxK4j42y73S3XB2cThz1dSEyK9J9tfu4mhuEfAw68=", "owner": "nix-community", "repo": "home-manager", - "rev": "cf662b6c98a0da81e06066fff0ecf9cbd4627727", + "rev": "440faf5ae472657ef2d8cc7756d77b6ab0ace68d", "type": "github" }, "original": { @@ -970,11 +970,11 @@ }, "nixlib": { "locked": { - "lastModified": 1679187309, - "narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=", + "lastModified": 1680397293, + "narHash": "sha256-wBpJ73+tJ8fZSWb4tzNbAVahC4HSo2QG3nICDy4ExBQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "44214417fe4595438b31bdb9469be92536a61455", + "rev": "b18d328214ca3c627d3cc3f51fd9d1397fdbcd7a", "type": "github" }, "original": { @@ -991,11 +991,11 @@ ] }, "locked": { - "lastModified": 1679464055, - "narHash": "sha256-RiZpwkbm1GeKRqrTtGGsEDieJyplMSRG1bQzOZgY378=", + "lastModified": 1680764424, + "narHash": "sha256-2tNAE9zWbAK3JvQnhlnB1uzHzhwbA9zF6A17CoTjnbk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d5cd198c80ee62a801a078ad991c99c0175971cf", + "rev": "15ae4065acbf414989a8677097804326fe7c0532", "type": "github" }, "original": { @@ -1006,11 +1006,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1679944521, - "narHash": "sha256-SipdMlnCv/pDvo/j7ctEGqKvQSmn2gcoHSJgIVysXbk=", + "lastModified": 1680876084, + "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "82ecc5b88ffed8c0317c064dfd8f82f4b9882100", + "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", "type": "github" }, "original": { @@ -1166,11 +1166,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1679748960, - "narHash": "sha256-BP8XcYHyj1NxQi04RpyNW8e7KiXSoI+Fy1tXIK2GfdA=", + "lastModified": 1680390120, + "narHash": "sha256-RyDJcG/7mfimadlo8vO0QjW22mvYH1+cCqMuigUntr8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da26ae9f6ce2c9ab380c0f394488892616fc5a6a", + "rev": "c1e2efaca8d8a3db6a36f652765d6c6ba7bb8fae", "type": "github" }, "original": { @@ -1277,11 +1277,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1677932085, - "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=", + "lastModified": 1680487167, + "narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", + "rev": "53dad94e874c9586e71decf82d972dfb640ef044", "type": "github" }, "original": { @@ -1293,11 +1293,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1679793451, - "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=", + "lastModified": 1680942619, + "narHash": "sha256-kpCW1IegAZfEjCVJW7IPN/hEtRL/9dxaFFYiHS5qVAk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0cd51a933d91078775b300cf0f29aa3495231aa2", + "rev": "6f95dd4fd050daf017cae2dfeb1cea1ec0e4c1a1", "type": "github" }, "original": { @@ -1392,11 +1392,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1679799335, - "narHash": "sha256-YrnDyftm0Mk4JLuw3sDBPNfSjk054N0dqQx8FW4JqDM=", + "lastModified": 1680404136, + "narHash": "sha256-06D8HJmRv4DdpEQGblMhx2Vm81SBWM61XBBIx7QQfo0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4740f80ca6e756915aaaa0a9c5fbb61ba09cc145", + "rev": "b93eb910f768f9788737bfed596a598557e5625d", "type": "github" }, "original": { @@ -1530,11 +1530,11 @@ }, "utils_3": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { diff --git a/modules/akkoma/default.nix b/modules/akkoma/default.nix index 46391f6..0031cb0 100644 --- a/modules/akkoma/default.nix +++ b/modules/akkoma/default.nix @@ -1,8 +1,9 @@ -{ config, ... }: +{ config, pkgs, ... }: let inherit (config.services) akkoma; inherit (config.sops) secrets; + inherit ((pkgs.formats.elixirConf { }).lib) mkRaw; in { services = { @@ -28,6 +29,17 @@ in enabled = false; redirect_on_failure = true; }; + + "Pleroma.Repo" = { + adapter = mkRaw "Ecto.Adapters.Postgres"; + socket_dir = "/run/postgresql"; + username = config.services.akkoma.user; + database = "akkoma"; + + prepare = mkRaw ":named"; + parameters.plan_cache_mode = "force_custom_plan"; + }; + "Pleroma.Web.Endpoint" = { secret_key_base = { _secret = secrets.akkoma-secret-key-base.path; }; signing_salt = { _secret = secrets.akkoma-signing-salt.path; };