Commit Graph

52 Commits

Author SHA1 Message Date
Felix Buehler
933a41a73f treewide: use optional instead of 'then []' 2023-06-25 09:11:40 -03:00
figsoda
701bcdbead nixos: fix typos 2023-05-19 22:31:04 -04:00
Kerstin Humm
aff288424f
nixos/mastodon: fixup sidekiq jobClasses assertion
See https://github.com/NixOS/nixpkgs/pull/225005#issuecomment-1516677321
2023-04-20 22:58:34 +02:00
Sandro
6152b09a6a
Merge pull request #225005 from erictapen/mastodon-sidekiq 2023-04-12 21:31:50 +02:00
Kerstin Humm
431ccf26e4
nixos/mastodon: add assertion for only allowing one sidekiq scheduler queue 2023-04-09 13:24:43 +02:00
Viv Lim
c778f4d225 nixos/mastodon: Allow configuring sidekiq processes
This change allows the number of sidekiq processes and which job classes
they handle to be configured.

An instance admin may choose to have separate sidekiq processes handling
jobs related to local users (`default` job class) and jobs related to
federation (`push`, `pull`, `ingress`), so that as the instance grows
and takes on more federation traffic, the local users' experience is not
as impacted.

For more details, see https://docs.joinmastodon.org/admin/scaling/#sidekiq

This pr also includes the following changes suggested in review:

- adds syslog identifiers for mastodon services
- moves working directory config to common cfgService
- adds mastodon.target
2023-04-06 16:30:16 +02:00
George Shammas
fef1559b05 nixos/mastodon: Add the ability to pass environment files 2023-01-15 00:18:40 -05:00
Sandro Jäckel
3071db258b
nixos/mastodon: remove duplicated shebang 2023-01-07 18:06:57 +01:00
Izorkin
8e14bf10c2
nixos/mastodon: update database configuration 2022-12-16 16:19:39 +03:00
Izorkin
e2cebf2134
nixos/mastodon: fix init db on remote postgresql 2022-12-16 16:14:39 +03:00
Vladimir Pouzanov
65aed3b37f
Allow to override the https settings 2022-12-09 19:23:50 +00:00
Lin Yinfeng
56099e008e nixos/mastodon: allow appending other env files to serviceConfig.EnvironmentFile 2022-12-07 15:07:17 +01:00
Sandro
e38618a657
Merge pull request #203825 from SuperSandro2000/mastodon-tootctl
Closes https://github.com/NixOS/nixpkgs/issues/199029
2022-12-04 11:29:45 +01:00
Sandro Jäckel
6e845a8491
nixos/mastodon: replace mastodon-env with a proper wrapper mastodon-tootctl 2022-12-03 02:59:39 +01:00
Daniel Nagy
dbe8182e74
treewide: switch to port type for nixos modules 2022-12-01 22:30:00 +01:00
Izorkin
93de6bf9ed nixos/mastodon: add smtp assertions 2022-11-28 12:07:32 +01:00
Izorkin
17933082cc nixos/mastodon: fix emoji import 2022-11-21 11:43:28 +01:00
Justinas Stankevicius
3f6eb10dbd nixos/mastodon: fix definition of mastodon-media-auto-remove 2022-11-12 22:22:41 +01:00
Manuel Bärenz
891dfb1b63 nixos/mastodon: add option mediaAutoRemove 2022-11-07 18:58:58 +01:00
Izorkin
2bb8cc27bd nixos/mastodon: fix start services 2022-10-26 16:35:23 +02:00
pennae
1d41cff3dc nixos/*: convert straggler options to MD 2022-08-31 17:27:38 +02:00
pennae
ef176dcf7e nixos/*: automatically convert option descriptions
conversions were done using https://github.com/pennae/nix-doc-munge
using (probably) rev f34e145 running

    nix-doc-munge nixos/**/*.nix
    nix-doc-munge --import nixos/**/*.nix

the tool ensures that only changes that could affect the generated
manual *but don't* are committed, other changes require manual review
and are discarded.
2022-08-31 16:32:53 +02:00
pennae
6039648c50 nixos/*: automatically convert option docs 2022-08-19 22:40:58 +02:00
pennae
8f8e101527 nixos/*: normalize <package> to <literal>
this renders the same in the manpage and a little more clearly in the
html manual. in the manpage there continues to be no distinction from
regular text, the html manual gets code-type markup (which was probably
the intention for most of these uses anyway).
2022-08-19 22:40:58 +02:00
pennae
61e93df189 nixos/*: automatically convert option docs to MD
once again using nix-doc-munge (69d080323a)
2022-08-03 22:46:41 +02:00
pennae
16102dce2f nixos/*: replace <code> in option docs with <literal>
markdown can't represent the difference without another extension and
both the html manual and the manpage render them the same, so keeping the
distinction is not very useful on its own. with the distinction removed
we can automatically convert many options that use <code> tags to markdown.

the manpage remains unchanged, html manual does not render
differently (but class names on code tags do change from "code" to "literal").
2022-08-03 21:03:23 +02:00
pennae
2e751c0772 treewide: automatically md-convert option descriptions
the conversion procedure is simple:

 - find all things that look like options, ie calls to either `mkOption`
   or `lib.mkOption` that take an attrset. remember the attrset as the
   option
 - for all options, find a `description` attribute who's value is not a
   call to `mdDoc` or `lib.mdDoc`
 - textually convert the entire value of the attribute to MD with a few
   simple regexes (the set from mdize-module.sh)
 - if the change produced a change in the manual output, discard
 - if the change kept the manual unchanged, add some text to the
   description to make sure we've actually found an option. if the
   manual changes this time, keep the converted description

this procedure converts 80% of nixos options to markdown. around 2000
options remain to be inspected, but most of those fail the "does not
change the manual output check": currently the MD conversion process
does not faithfully convert docbook tags like <code> and <package>, so
any option using such tags will not be converted at all.
2022-07-30 15:16:34 +02:00
Jelle Besseling
0f69a517a4 nixos/mastodon: use redis.servers 2022-05-13 15:39:44 +02:00
Kerstin Humm
f44b12fb52 mastodon: use correct GitHub Url
The tootsuite organization was renamed to mastodon ages ago.
2022-03-31 13:17:11 +02:00
Kerstin Humm
23a1971a4e nixos/mastodon: preload libjemalloc.so
Co-authored-by: Izorkin <izorkin@elven.pw>
2022-03-31 13:17:11 +02:00
Jelle Besseling
29366071a4 nixos/mastodon: add RAILS_ROOT to mastodon-env 2022-02-19 16:42:45 +01:00
Izorkin
d1a8806e39 nixos/mastodon: allow '@resources' filter to mastodon-web service 2021-11-07 11:59:36 +01:00
Izorkin
a71576b07b nixos/mastodon/streaming: add '@memlock' SystemCallFilter 2021-11-06 16:45:20 +01:00
Izorkin
91e510ae22 nixos/mastodon: add '@ipc' SystemCallFilter 2021-11-06 16:45:20 +01:00
Izorkin
700ea62f54 nixos/mastodon: remove duplicates SystemCallFilters 2021-11-06 16:45:20 +01:00
Izorkin
943f15d4b7 nixos/mastodon: add new sandboxing options 2021-11-06 16:45:20 +01:00
Izorkin
1d948428c8
nixos/mastodon: fix send e-mail notifications 2021-10-26 10:59:39 +03:00
Naïm Favier
2ddc335e6f
nixos/doc: clean up defaults and examples 2021-10-04 12:47:20 +02:00
embr
023239912c nixos/mastodon: Add configurable web- and streaming concurrency
Might as well do this while I'm at it.
2021-09-21 16:35:17 +02:00
embr
8c1e6a8598 nixos/mastodon: Fix sidekiq's DB_POOL, add configurable concurrency
The `services.mastodon` module currently hardcodes sidekiq's concurrency
to 25, but doesn't set a DB pool size, which defaults to 5 or the number
of configured web threads.

(This behaviour is very strange, and arguably a mastodon bug.)

This also makes sidekiq's concurrency configurable, because 25 is a tad
high for the hardware I'm running it on.
2021-09-21 16:35:17 +02:00
Kerstin Humm
224df6940f nixos/mastodon: use rails command instead of rake
Co-Authored-By: Izorkin <izorkin@elven.pw>
2021-05-21 15:04:12 +02:00
Izorkin
8723d226b4 nixos/mastodon: update SystemCallFilters 2021-04-28 00:44:25 +02:00
Izorkin
47d3e955fc nixos/mastodon/sandbox: add @privileged and @raw-io to SystemCallFilter 2021-04-24 19:12:10 +02:00
Izorkin
f3a032dee5 nixos/mastodon: enable sandbox mode 2021-03-24 17:28:50 +01:00
Justin Humm
40f60919ab nixos/mastodon: fix group membership for nginx
4255954d97 set the StateDirectory to 0750,
but nginx wasn't in the Mastodon group. This commit also deletes a line,
that probably was intended to serve this purpose, but makes no sense.
Why should the Mastodon user be added as an extraGroup to the nginx
user?
2021-02-17 15:16:14 +01:00
Izorkin
96f0c2c191 mastodon, nixos/mastodon: use the same nodejs package in package and module 2021-02-16 17:57:31 +01:00
Izorkin
e3a7270e3d nixos/mastodon: fix mastodon-init-db script 2021-02-15 11:43:03 +01:00
Izorkin
4255954d97 nixos/mastodon: optimize permissions 2021-02-15 11:43:03 +01:00
Izorkin
424e7b0f5d nixos/mastodon: use unix socket to default 2021-02-15 11:43:03 +01:00
Izorkin
f1adea1a94 nixos/mastodon: add option trustedProxy 2021-02-15 11:43:03 +01:00