Add elasticsearch; update flake

This commit is contained in:
Agatha Lovelace 2023-05-03 13:47:01 +02:00
parent ffd84f6f2a
commit 0dc71ad1cf
Signed by: sorceress
GPG Key ID: 01D0B3AB10CED4F8
8 changed files with 120 additions and 89 deletions

View File

@ -9,7 +9,9 @@ in {
font = {
package = pkgs.iosevka;
name = "Iosevka Gothic";
size = 11.5;
# Has to be an integer until https://github.com/nix-community/home-manager/commit/e56714a057ecfa8b89caeccc23e32c628874ad4a is in 22.11
# size = 11.5;
size = 12;
};
keybindings = { "f5" = "load_config_file"; };

View File

@ -9,6 +9,10 @@
smtp.fromAddress = "noreply@technogothic.net";
smtp.createLocally = false;
database.passwordFile = "/var/lib/mastodon/secrets/db-password";
elasticsearch = {
host = "127.0.0.1";
inherit (config.services.elasticsearch) port;
};
extraConfig = {
WEB_DOMAIN = "fv.technogothic.net";
GITHUB_REPOSITORY = "AgathaSorceress/mastodon";
@ -21,4 +25,10 @@
};
users.groups.mastodon.members = [ config.services.nginx.user ];
services.elasticsearch = {
enable = true;
cluster_name = "mastodon-es";
package = pkgs.elasticsearch7;
};
}

View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
sha256 = "sha256-Y6ORZE18/qeVEvuzbx+tPe8Pjjxvf7+mHwspW3pmuEg=";
sha256 = "sha256-5KmPgKE1QRPoTjeSYidKt/z9vzWzTOoJVr5dNtofKJY=";
};
nativeBuildInputs = [

View File

@ -200,10 +200,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ncv2az1zlj33bsllr6q1qdvbw42gv91lxq0ryclbv8l8xh841jg";
sha256 = "034x6mbrv9apd83v99v9pm8vl3d17w5bbwws26gr4wv95fylmgnc";
type = "gem";
};
version = "3.1.0";
version = "4.0.0";
};
attr_required = {
groups = ["default"];
@ -240,10 +240,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18vf783c56fnw3a21rqx654gggzx9glvq6285hzc2wjwpxs2qllj";
sha256 = "18ndv604p1p3gkyy0d958jx2wp74d100q6vbc6ak70a7bv93wqsg";
type = "gem";
};
version = "1.743.0";
version = "1.752.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@ -273,10 +273,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mapdzm97rv22pca1hvvshwsafa12gd2yv2fcy63dfjn5vjjq893";
sha256 = "1s5v3799pi7ik53gv7dl02am5pngv6x4azzwx9my09nll4q3lfk8";
type = "gem";
};
version = "1.120.1";
version = "1.121.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@ -368,10 +368,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lcxxlrzgpi9z2mr2v19xda6fdysmn5psa9bsp2rksa915v91fds";
sha256 = "0wzvxpabnjwwjgr9s13965dbdgl3qfvwjbmhimh83p81bm5lsrnw";
type = "gem";
};
version = "5.4.0";
version = "5.4.1";
};
browser = {
groups = ["default"];
@ -432,10 +432,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "168kyi0gv2s84jm533m8rg0dii50flr06n6s2ci6kzsib3n9n8dr";
sha256 = "09rndb1fa9r7mhb2sc6p3k0pcarhg8mv0kfmvd1zdb0ciwwp7514";
type = "gem";
};
version = "2.0.1";
version = "2.1.0";
};
capistrano-rails = {
dependencies = ["capistrano" "capistrano-bundler"];
@ -518,10 +518,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c58g2scsnvfq8b9y9pqd3x709hgipy911kz6jv475pwxi6yq5yz";
sha256 = "1wxq6396814ngwnvwcjkkqm8ji8d7q385gw53kr1dbfihiivlizq";
type = "gem";
};
version = "7.3.0";
version = "7.3.2";
};
chunky_png = {
groups = ["default"];
@ -588,10 +588,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nj4r58m5cpfdsijj6gjfs3yzcnxq2halagjk07wjcrgj6z8ayb7";
sha256 = "0dndngqvkm2ih3wqn5ilf9980c1cc57lqn5lywx3myalzpilq05z";
type = "gem";
};
version = "2.3.0";
version = "2.4.0";
};
cose = {
dependencies = ["cbor" "openssl-signature_algorithm"];
@ -631,10 +631,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b";
sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj";
type = "gem";
};
version = "1.12.0";
version = "1.14.0";
};
date = {
groups = ["default" "development"];
@ -651,10 +651,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lswmjwxf1clzaimikhiwd9s1n07qkyz7a9xwng64j4fxsajykqp";
sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga";
type = "gem";
};
version = "1.0.0";
version = "1.1.0";
};
devise = {
dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "warden"];
@ -672,9 +672,11 @@
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04f5rb8fg4cvzm32v413z3h53wc0fgxg927q8rqd546hdrlx4j35";
type = "gem";
fetchSubmodules = false;
rev = "e685f91ce62d036259885fbe31fcb4fa930bcfcb";
sha256 = "1zdlhzm2m87xgzacmm68j51wpz7dcmg8wl1r9wxkhs51c90yvqla";
type = "git";
url = "https://github.com/tinfoil/devise-two-factor.git";
};
version = "4.0.2";
};
@ -852,10 +854,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08idrrnpwzr87wc5yhyv6id1f6zigr3nfn45mff01605b0zghdby";
sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09";
type = "gem";
};
version = "0.95.0";
version = "0.99.0";
};
fabrication = {
groups = ["development" "test"];
@ -1176,10 +1178,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d";
sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn";
type = "gem";
};
version = "2.0.3";
version = "2.1.0";
};
hiredis = {
groups = ["default"];
@ -1385,10 +1387,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gdvm83yaa5n8hwapwzxwfcmbypiq2i0zfx4mzz67wg55p2cnli4";
sha256 = "155rygs093i8i04i38a97hs5icmqk2jkkhx76w31yxyr3bxfbgx3";
type = "gem";
};
version = "3.0.0";
version = "4.0.0";
};
jsonapi-renderer = {
groups = ["default"];
@ -1472,10 +1474,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xdyvr5j0gjj7b10kgvh8ylxnwk3wx19my42wqn9h82r4p246hlm";
sha256 = "06r43899384das2bkbrpsdxsafyyqa94il7111053idfalb4984a";
type = "gem";
};
version = "2.5.0";
version = "2.5.2";
};
letter_opener = {
dependencies = ["launchy"];
@ -1631,10 +1633,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9";
type = "gem";
};
version = "3.2022.0105";
version = "3.2023.0218.1";
};
mini_mime = {
groups = ["default" "development" "test"];
@ -1671,10 +1673,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3";
sha256 = "172ky0r1jfcm3xyg067pia7k1lhc15vw9svv93max120gcdbrvji";
type = "gem";
};
version = "1.6.0";
version = "1.7.0";
};
multi_json = {
groups = ["default"];
@ -1777,10 +1779,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qp3i8bi7ji1np0530bp2p9zrrn6galvmbsivxwpkjdpjdyn19sr";
sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687";
type = "gem";
};
version = "7.0.1";
version = "7.1.0";
};
nio4r = {
groups = ["default"];
@ -1936,10 +1938,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597";
type = "gem";
};
version = "1.22.1";
version = "1.23.0";
};
parser = {
dependencies = ["ast"];
@ -1947,10 +1949,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s5afi89p76k8vpwiqvh343pm5l23ijqlpszhz65afym3zpkxhzx";
sha256 = "08f89nssj7ws7sjfvc2fcjpfm83sjgmniyh0npnmpqf5sfv44r8x";
type = "gem";
};
version = "3.2.2.0";
version = "3.2.2.1";
};
parslet = {
groups = ["default"];
@ -1978,10 +1980,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr";
sha256 = "1qja5f6k9v3jjip7mv3qjgx7rwmk1663cxz8jnb589znvj4wxd9l";
type = "gem";
};
version = "1.4.6";
version = "1.5.2";
};
pghero = {
dependencies = ["activerecord"];
@ -1989,10 +1991,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vyi1v5riqv1cirskcs2mw7301kk6lg170nqxiyybg68rkicj3xr";
sha256 = "002v32dzyyr29xd9cdsqp55g5gx19skvq9b4a4hr9lrs4i1xsavm";
type = "gem";
};
version = "3.3.2";
version = "3.3.3";
};
pkg-config = {
groups = ["default"];
@ -2020,10 +2022,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dfknfwwlzmb594acgi6v080ngxbnhshn3gzvdh5x2vx1aqvwc5r";
sha256 = "10rzwdz43yy20lwzsr2as6aivhvwjvqh4nd48sa0ga57sizf1fb4";
type = "gem";
};
version = "1.18.0";
version = "1.21.0";
};
premailer-rails = {
dependencies = ["actionmailer" "net-smtp" "premailer"];
@ -2062,10 +2064,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qqd5lb3mamh53ssx0xavmspg4blhq6hd1kipksw20bq71xcklf5";
sha256 = "0yf4jmkyy8das7pj1xzwllfvzkhq2p6p534j61d9h4wz3nfyf0s5";
type = "gem";
};
version = "6.2.1";
version = "6.2.2";
};
pundit = {
dependencies = ["activesupport"];
@ -2103,10 +2105,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk";
sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk";
type = "gem";
};
version = "2.2.6.4";
version = "2.2.7";
};
rack-attack = {
dependencies = ["rack"];
@ -2331,10 +2333,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d6241adx6drsfzz74nx1ld3394nm6fjpv3ammzr0g659krvgf7q";
sha256 = "17xizkw5ryw8hhq64iqxmzdrrdxpc5lhkqc1fgm1aj0zsk1r2950";
type = "gem";
};
version = "2.7.0";
version = "2.8.0";
};
request_store = {
dependencies = ["rack"];
@ -2373,10 +2375,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11q7rkjx40yi6lpylgl2jkpy162mjw7mswrcgcax86vgpbpjx6i3";
sha256 = "10mmzc85y7andsich586ndykw678qn1ns2wpjxrg0sc0gr4w3pig";
type = "gem";
};
version = "6.2.0";
version = "6.2.2";
};
rpam2 = {
groups = ["default" "pam_authentication"];
@ -2415,10 +2417,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f";
sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm";
type = "gem";
};
version = "3.12.1";
version = "3.12.2";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
@ -2426,10 +2428,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6";
sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89";
type = "gem";
};
version = "3.12.2";
version = "3.12.3";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
@ -2437,10 +2439,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc";
sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2";
type = "gem";
};
version = "3.12.3";
version = "3.12.5";
};
rspec-rails = {
dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
@ -2501,10 +2503,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dh5nyjansk73wv9rj3y3ry0ajslah4y5k40bg54pqjsal4r9h6l";
sha256 = "0l46lw5gfj3mcm982wpmx7br4rs466gyislv0hfwcsk8dxhv1zkw";
type = "gem";
};
version = "1.49.0";
version = "1.50.2";
};
rubocop-ast = {
dependencies = ["parser"];
@ -2523,10 +2525,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pz52ml0qbxgcjlmp8y0wsq8xy398n6ypkbrwfaa8zb0v7pscj6n";
sha256 = "01fn05a87g009ch1sh00abdmgjab87i995msap26vxq1a5smdck6";
type = "gem";
};
version = "2.17.1";
version = "2.18.0";
};
rubocop-performance = {
dependencies = ["rubocop" "rubocop-ast"];

View File

@ -2,8 +2,8 @@
{ fetchgit, applyPatches }: let
src = fetchgit {
url = "https://github.com/AgathaSorceress/mastodon.git";
rev = "dba9fc96761d19f65b519792cd469c3a1859d1db";
sha256 = "0qismh128j16b0vfq9jfc37i68xnmbza066r5r4ynrgfyrcfzsdk";
rev = "a756be76b5b3455c17ccc2cb68dd3f32e3140c03";
sha256 = "1y0acq6rbmiw6j7zx3kma7nk60djdvczphms81vln7mdmbsdrd32";
};
in applyPatches {
inherit src;

View File

@ -1 +1 @@
"dba9fc96761d19f65b519792cd469c3a1859d1db"
"a756be76b5b3455c17ccc2cb68dd3f32e3140c03"

View File

@ -284,11 +284,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1682049207,
"narHash": "sha256-0RdlHulXR39YM00Kq0o2iCxmAxBsiOh2xEuMpq1ZkHM=",
"lastModified": 1682990279,
"narHash": "sha256-ooWLgZItK9clTqe5WgdewIWkW0L4T1zuhhGNwePPvW8=",
"owner": "helix-editor",
"repo": "helix",
"rev": "ee7413a3fd723015843e569924abbfbf32b56182",
"rev": "d1a4bd876b3ae646693c0905d7f29b636e2e5033",
"type": "github"
},
"original": {
@ -301,18 +301,20 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
]
],
"utils": "utils_3"
},
"locked": {
"lastModified": 1682072616,
"narHash": "sha256-sR5RL3LACGuq5oePcAoJ/e1S3vitKQQSNACMYmqIE1E=",
"lastModified": 1681092193,
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "47d6c3f65234230d37f1cf7d3d6b5575ec80fe0c",
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-22.11",
"repo": "home-manager",
"type": "github"
}
@ -529,11 +531,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1682566018,
"narHash": "sha256-HPzPRFiy2o/7k7mtnwfM1E6NVZHiFbPdmYCMoIpkHO4=",
"lastModified": 1682960002,
"narHash": "sha256-5Zjh4pT3lAjFGN1gVrjqj1LLJHKCAlGdLD8raU7oEMc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8e3b64db39f2aaa14b35ee5376bd6a2e707cadc2",
"rev": "8670e496ffd093b60e74e7fa53526aa5920d09eb",
"type": "github"
},
"original": {
@ -683,11 +685,11 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1681932375,
"narHash": "sha256-tSXbYmpnKSSWpzOrs27ie8X3I0yqKA6AuCzCYNtwbCU=",
"lastModified": 1682931856,
"narHash": "sha256-phFRasoX9a7pPwfHwUO4A3HjccedEgVQLHR1UoPCY90=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3d302c67ab8647327dba84fbdb443cdbf0e82744",
"rev": "d529862de0cdabaebac67a48d825af99c2c3b50d",
"type": "github"
},
"original": {
@ -851,7 +853,7 @@
"inputs": {
"naersk": "naersk_3",
"nixpkgs": "nixpkgs_10",
"utils": "utils_3"
"utils": "utils_4"
},
"locked": {
"lastModified": 1681562998,
@ -904,6 +906,21 @@
}
},
"utils_3": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_4": {
"locked": {
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
@ -918,7 +935,7 @@
"type": "github"
}
},
"utils_4": {
"utils_5": {
"inputs": {
"systems": "systems_3"
},
@ -939,14 +956,14 @@
"vampysite": {
"inputs": {
"nixpkgs": "nixpkgs_11",
"utils": "utils_4"
"utils": "utils_5"
},
"locked": {
"lastModified": 1682093832,
"narHash": "sha256-qMqCrkJ8CT7AtIgjuRQwXMGLyndhKKBWY3BuDI6ujnc=",
"lastModified": 1682852086,
"narHash": "sha256-jxkFNoaIRVaNLbv86amo5mgCDnWmGrKzvBkUwcp2Ahw=",
"ref": "refs/heads/mistress",
"rev": "0a248079330351ac57f3aba6c4389f4e17c01e91",
"revCount": 15,
"rev": "663afd4160aa14ddfe738ebcf8a36d08ddbc3c96",
"revCount": 17,
"type": "git",
"url": "https://git.lain.faith/sorceress/vampysite"
},

View File

@ -4,7 +4,7 @@
nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable";
home-manager = {
url = "github:nix-community/home-manager";
url = "github:nix-community/home-manager/release-22.11";
inputs.nixpkgs.follows = "nixpkgs";
};