Commit graph

76 commits

Author SHA1 Message Date
h7x4 a7d64941f4
nixos/prosody: use types.port 2025-09-22 16:46:44 +02:00
dish 970dcca69c
treewide: Fix links in module documentation 2025-08-25 12:55:11 -04:00
Sandro 338cbf9e54
nixos/prosody: substitute environment variables to allow securely loa… (#431286) 2025-08-21 15:02:56 +02:00
Sandro Jäckel cea3dfac9e
nixos/prosody: add muc_moderation 2025-08-20 15:55:15 +02:00
lassulus 5316ba88a5 nixos/prosody: remove erronous spaces in module names 2025-08-10 17:09:16 +02:00
lassulus 804919a7f4 nixos/prosody: fix serialization error if httpFileShare is null 2025-08-10 01:03:49 +02:00
Sandro Jäckel 68bcdbfc9e
nixos/prosody: substitute environment variables to allow securely loading secrets 2025-08-06 00:49:58 +02:00
Sandro Jäckel e42cceb90c
nixos/prosody: fix message reactions and moderation in muc's
It took us over 3 hours to figure this out, I want to cry :,(
2025-08-04 00:58:50 +02:00
Sandro Jäckel dfa4ce2923
nixos/prosody: add support for httpFileShare.http_host 2025-08-04 00:58:49 +02:00
Sandro Jäckel 76224149c1
nixos/prosody: fix certs directory missing error
Prosody starts without it but not lay false leads for others to debug.
2025-08-03 21:35:33 +02:00
Sandro Jäckel a302465e0e
nixos/prosody: wire up modules.mam option 2025-08-03 21:35:33 +02:00
Sandro Jäckel 445cd5701d
nixos/prosody: enable admin_shell to fix tests 2025-08-03 21:35:32 +02:00
Sandro Jäckel 3ea8513fb5
nixos/prosody: disable http_files per default as it requires configuration to not break http_file_share 2025-08-03 21:35:32 +02:00
Sandro Jäckel c8094c2f03
nixos/prosody: fix logged error that /etc/mime.types cannot be found 2025-08-03 21:35:30 +02:00
Sandro Jäckel d323803eee
nixos/prosody: minor formatting cleanup 2025-08-03 21:35:30 +02:00
Sandro Jäckel 4e12c9b92e
nixos/prosody: remove obsoloted http_upload and replace it with http_file_share 2025-08-03 21:35:30 +02:00
Sandro Jäckel c26ed9f391
nixos/prosody: remove vcard_muc as it has been obsoloted
Sadly I did not find a way to use lib.mkRemovedOptionModule for this
option that did not break eval. :(
2025-08-03 21:35:29 +02:00
Sandro Jäckel 246e3fbf0f
nixos/prosody: allow listening on port 80
Co-authored-by: mirror230469 <215964377+mirror230469@users.noreply.github.com>
2025-08-03 21:35:28 +02:00
Sandro Jäckel e46dcd7074
prosody: 0.12.5 -> 13.0.2, nixos/prosody: fix startup
Co-authored-by: mirror230469 <215964377+mirror230469@users.noreply.github.com>
2025-08-03 21:35:28 +02:00
Sandro Jäckel a5e26447d7
nixos/prosody: fix empty config check output, fix some errors which are not fatal 2025-08-01 05:17:37 +02:00
Sandro Jäckel e2e3e77ab0
nixos/prosody: add config check option 2025-08-01 04:10:49 +02:00
Sandro Jäckel 8c9a0efe30
nixos/prosody: deadnix, remove extra new lines, minor cleanup 2025-08-01 03:12:29 +02:00
Wolfgang Walther 5a0711127c
treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Silvan Mosberger 374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
Marcel Novotny 2411e6eecd Added Allowners muc module to prosody and jitsi-meet 2025-03-25 23:17:58 +01:00
Masum Reza 9ec0508f83
Merge pull request #171855 from ju1m/prosody
nixos/prosody: support mod_http_file_share
2024-07-04 21:59:29 +05:30
Someone Serge 12c6d79e72 nixos/prosody: provide an escape hatch for overriding the logging configuration 2024-07-01 01:24:19 +00:00
Julien Moutinho d4954e0df2 nixos/prosody: support mod_http_file_share 2024-06-01 22:23:20 +02:00
stuebinm 6afb255d97 nixos: remove all uses of lib.mdDoc
these changes were generated with nixq 0.0.2, by running

  nixq ">> lib.mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> Inherit >> mdDoc[remove]" --batchmode nixos/**.nix

two mentions of the mdDoc function remain in nixos/, both of which
are inside of comments.

Since lib.mdDoc is already defined as just id, this commit is a no-op as
far as Nix (and the built manual) is concerned.
2024-04-13 10:07:35 -07:00
h7x4 0a37316d6c
treewide: use mkPackageOption
This commit replaces a lot of usages of `mkOption` with the package
type, to be `mkPackageOption`, in order to reduce the amount of code.
2023-11-27 01:28:36 +01:00
toastal ccb0f87129 prosody: use default network, remove libevent, config deprecated
`use_libevent` config option has been deprecated as there are 3
networking back-ends (see: https://prosody.im/doc/network_backend). It
is probably unwise to stray from the defaults (epoll).

Review instructed to flat-out remove it versus previously making it opt-in.
2023-10-15 10:02:50 +07:00
Felix Buehler 933a41a73f treewide: use optional instead of 'then []' 2023-06-25 09:11:40 -03:00
pennae 0a6e6cf7e6 nixos/manual: render module chapters with nixos-render-docs
this converts meta.doc into an md pointer, not an xml pointer. since we
no longer need xml for manual chapters we can also remove support for
manual chapters from md-to-db.sh

since pandoc converts smart quotes to docbook quote elements and our
nixos-render-docs does not we lose this distinction in the rendered
output. that's probably not that bad, our stylesheet didn't make use of
this anyway (and pre-23.05 versions of the chapters didn't use quote
elements either).

also updates the nixpkgs manual to clarify that option docs support all
extensions (although it doesn't support headings at all, so heading
anchors don't work by extension).
2023-01-27 20:07:34 +01:00
pennae 53fc887582 nixos/manual: move "edit the MD file" comments to generated XML 2023-01-10 12:34:37 +01:00
pennae bf92eaebe4 nixos/manual: generate module chapters with md-to-db.sh 2023-01-10 10:32:00 +01:00
pennae 23ea73b416 nixos/manual: enable smart quotes for all MD chapters 2023-01-10 10:31:59 +01:00
pennae 963c6f54aa nixos/prosody: convert manual chapter to MD 2023-01-10 10:31:57 +01:00
figsoda 6bb0dbf91f nixos: fix typos 2022-12-17 19:31:14 -05:00
figsoda dfff1a2b83 nixos/prosody: simplify logic 2022-11-30 17:36:07 -05:00
pennae 722b99bc0e nixos/*: convert options with admonitions to MD
rendering changes only slightly, most changes are in spacing.
2022-08-31 16:36:16 +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
Aaron Andersen 078a53824e nixos/prosody: provide additional details in the user and group options description 2022-06-18 10:08:08 -04:00
Aaron Andersen 79bfd3c0d0 nixos/prosody: conditionally provision required directories with StateDirectory 2022-06-18 10:05:15 -04:00
Félix Baylac-Jacqué 20693a1e73
prosody: 0.11.13 -> 0.12.0
See https://blog.prosody.im/prosody-0.12.0-released for more
informations.

We remove the various lua wrappers introduced by
6799a91843 and
16d0b4a69f. It seems like we don't need
them anymore. I'm not brave enough to dig into the Lua machinery to
see what resolved that. Sorry, you'll have to trust me on that one.

We should probably think about the migration from http_upload to
http_file_share for the NixOS module. It's not trivial, we need to
make sure we don't break the already uploaded URLs.
2022-05-02 12:43:19 +02:00
Naïm Favier 2ddc335e6f
nixos/doc: clean up defaults and examples 2021-10-04 12:47:20 +02:00
Malte Brandy cebf9198f3
treewide: De-inline uses of lib.boolToString
This commit should not change eval results
2020-10-14 01:46:17 +02:00
rnhmjoj 20d491a317
treewide: completely remove types.loaOf 2020-09-02 00:42:50 +02:00
Jörg Thalheim ba930d8679
nixos/modules: remove trailing whitespace
This leads to ci failure otherwise if the file gets changed.
git-blame can ignore whitespace changes.
2020-08-07 14:45:39 +01:00
Martin Milata ce0c39be0b nixos/prosody: add MUC extraConfig, fix extraConfig order
Add extraConfig option for the muc submodule.

Also move the global extraConfig before all components and
virtualhosts, because the manual states:

    The configuration is divided into two parts. The first part is known as
    the "global" section. All settings here apply to the whole server, and
    are the default for all virtual hosts.

    The second half of the file is a series of VirtualHost and Component
    definitions. Settings under each VirtualHost or Component line apply
    only to that host.

Before, if at least one muc was defined, or uploadHttp enabled, the
global extraConfig would end up after "muc" or "http_upload" component
making it apply to that component only and not globally.
2020-05-04 00:10:33 +02:00
Félix Baylac-Jacqué f5b1e6bc21
nixos/prosody: add NixOS manual entry
We add a Prosody entry to the NixOS manual showing how to setup a
basic XEP-0423 compliant Prosody service. This example also showcase
how to generate the associated ACME certificates.

Note: The <programlisting> body might look poorly indented, but trust
me, it's necessary. If we try to increase their indentation level, the
HTML output will end up containing a lot of unecesseray heading spaces
breaking the formatting...
2020-05-01 19:57:33 +02:00