Commit Graph

1032 Commits

Author SHA1 Message Date
laalsaas
9e5316a1c5 nixos/varnish: change default stateDir to /run
The stateDir, or as varnish calls it, the workdir should always be a
tmpfs. Otherwise, performance issues may occur. See:

- https://varnish-cache.org/docs/trunk/reference/varnishd.html#opt-n

- https://github.com/varnishcache/varnish-cache/issues/4121
2024-08-23 21:45:43 +02:00
Emily
7ec755257a hydron: drop
This package was marked as vulnerable in
<https://github.com/NixOS/nixpkgs/pull/255959>, almost a year ago and
over a year after the project was archived upstream. The package and
module are unusable without bypassing a security warning in 23.05,
23.11, and 24.05.

Given that the package is intended as an organizer for
potentially‐untrusted media files, the vulnerability is critical and
leads to remote code execution, and there is basically no prospect
of upstream releasing a fix, remove the package and module entirely
for 24.11.
2024-08-03 20:27:19 +01:00
euxane
efc7aebda7 nixos/fcgiwrap: require explicit owner for UNIX sockets
The default in the previous option documentation was incorrect,
resulting in the UNIX socket to be unreachable except by root by
default.

This fixes the documentation and requires consumers to set values
explicitly for the socket's owning user and group.
2024-07-31 11:03:06 +02:00
euxane
4f2da6c9c1 nixos/fcgiwrap: add option migration instruction errors
This adds migration instructions for the removed global shared instance
configuration of fcgiwrap.

Adding those explicit messages to the previous options requires moving
the newly defined options from `services.fcgiwrap.*` to
`services.fcgiwrap.instances.*` due to an option namespace clash.

`mkRenamedOptionModule` was not used because the previous options do
not directly map to the new ones. In particular, `user` and `group`
were described as setting the socket's permission, but were actually
setting the process' running user.

Co-authored-by: Minijackson <minijackson@riseup.net>
2024-07-31 11:02:37 +02:00
Jörg Thalheim
5356420466 treewide: remove unused with statements from maintainer lists
$ find -type f -name '*.nix' -print0 | xargs -P "$(nproc)" -0 sed -i \
  -e 's!with lib.maintainers; \[ *\];![ ];!' \
  -e 's!with maintainers; \[ *\];![ ];!'
2024-07-29 10:06:20 +08:00
TheRealGramdalf
d66d94b37b
nixos/caddy: fix group option description (#328034) 2024-07-24 16:40:07 +08:00
Sven Slootweg
51a72a8271
nixos/caddy: fix module docs for new root syntax (#328444)
Old syntax no longer works; `root` now takes two arguments. Updated example in module documentation to reflect this.
2024-07-24 16:38:48 +08:00
Gavin John
dffd5b699d
nixos/httpd: Use mkEnableOption 2024-07-04 13:44:24 +00:00
Thomas Gerbet
8ddb1bb721
Merge pull request #318599 from pacien/nixos-fcgiwrap-isolation
nixos/fcgiwrap: refactor to fix permissions
2024-07-02 21:52:33 +02:00
Sandro
bd4241bcc8
Merge pull request #297826 from anthonyroussel/update-tomcat_connectors
apacheHttpdPackages.mod_jk: 1.2.48 -> 1.2.49, rename from tomcat_connectors
2024-07-02 20:26:13 +02:00
Sandro
08605eec2a
Merge pull request #311381 from minijackson/tomcat-port
nixos/tomcat: add 'port' option
2024-06-26 00:53:58 +02:00
Sandro
33f83c6252
Merge pull request #316977 from eclairevoyant/fix-mkEnableOption
treewide: fix mkEnableOption usage
2024-06-25 22:42:16 +02:00
euxane
51b246a1ac nixos/fcgiwrap: do not run as root by default
Use a dynamic user instead unless one is specified.
2024-06-22 19:45:25 +02:00
euxane
81f72015f0 nixos/fcgiwrap: add unix socket owner, private by default
This adds a few options to properly set the ownership and permissions
on UNIX local sockets, set to private by default.

Previously, the created UNIX local sockets could be used by any local
user. This was especially problematic when fcgiwrap is running as root
(the default).
2024-06-22 19:45:25 +02:00
euxane
289c1585c2 nixos/fcgiwrap: limit prefork type to positives 2024-06-22 19:45:25 +02:00
euxane
3955eaf450 nixos/fcgiwrap: improve readability of CLI args 2024-06-22 19:45:25 +02:00
euxane
022289f2fa nixos/fcgiwrap: group options logically, fix doc
Since we're already introducing some backward-incompatible change in
the previous commit, let's make the options more tidy, also preparing
for the introduction of more options.

This also fixes the documentation of the user and group options which
are applying to the service's running user, not the socket.
2024-06-22 19:45:25 +02:00
euxane
41419ca288 nixos/fcgiwrap: refactor for multiple instances
This allows configuring and starting independent instances of the
fgciwrap service, each with their own settings and running user,
instead of having to share a global one.

I could not use `mkRenamedOptionModule` on the previous options
because the aliases conflict with `attrsOf submodule` now defined at
`services.fcgiwrap`. This makes this change not backward compatible.
2024-06-22 19:45:15 +02:00
Philip Taron
3ac49bcf94
nixos/bluemap: fix defaults issue with services.bluemap.host
The default for this value depends on `config.networking.domain`, which is typed as `types.nullOr types.str` in nixos/modules/tasks/network-interfaces.nix

As a result, the default for `services.bluemap.host` either has to be `types.nullOr types.str`, or we need to drop the default.

Based on PR feedback, this commit drops the default and requires configuration through the `services.bluemap.host` option.

While this is a breaking change, since the module is a month old, there should be very few users so far.
2024-06-20 21:05:03 -07:00
éclairevoyant
7d8742da87
treewide: fix mkEnableOption usage 2024-06-14 02:41:42 -04:00
Anthony Roussel
e0a905ef96
apacheHttpdPackages.mod_jk: rename from tomcat_connectors 2024-06-07 08:41:04 +02:00
Sandro
0387dede7c
Merge pull request #316732 from SuperSandro2000/tailscale-auth 2024-06-03 12:49:31 +02:00
Sarah Brofeldt
f7393d13fe nixos/garage: fix replication 1.0 assertion
Use the `cfg.package.version` (string) instead of the entire package so
users don't see  `error: value is a set while a string was expected`
instead of the intended assertion message.
2024-06-03 09:56:42 +02:00
Sandro Jäckel
f643e4fa5b
nixos/tailscale-auth: fix enable option description 2024-06-02 22:30:42 +02:00
Martin Weinelt
a68d0e6819
Merge pull request #312771 from mweinelt/garage-data-dir
nixos/garage: support 0.9.0+ data_dir format
2024-05-22 13:18:36 +02:00
Martin Weinelt
07a26ae742
nixos/garage: support 0.9.0+ data_dir format
https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#data_dir
2024-05-22 13:12:46 +02:00
Daniel Olsen
718819092b nixos/bluemap: init module 2024-05-21 19:16:21 +02:00
Raito Bezarius
2759c33ca3 garage: drop maintenance
Given the current situation, I have not been able to take care of
anything related to that module. Upgrades are merged without upgrading
properly the module, unfortunately.

This caused too much divergence and I still do not have the energy to
take care of it.

I will leave it to the more active recent committers who touched the
module to take it from there.

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
2024-05-19 23:01:36 +02:00
Florian Klink
24ace2abee nixos/garage: assert that replication_mode is string
The explicit `replication_mode` option in `services.garage.settings`
has been removed and is now handled by the freeform settings in order
to allow it being completely absent (for Garage 1.x).
That module option previously `toString`'ed the value it's configured
with, which is now no longer possible.
Warn the user if they're still using a non-string here.
2024-05-15 11:48:25 +02:00
Florian Klink
1284b4f7fa Reapply "nixos/garage: drop replication_mode setting"
This reverts commit 67cf6279d0.

Reintroduce the option, we'll fix it in followup commits.
2024-05-15 11:39:21 +02:00
Yureka
67cf6279d0
Revert "nixos/garage: drop replication_mode setting" 2024-05-15 09:51:48 +02:00
Minijackson
a8da5dbf32
nixos/tomcat: add 'port' option 2024-05-13 16:04:55 +02:00
Florian Klink
c8b2579f1f
Merge pull request #309643 from flokli/garage-replication_mode
nixos/garage: drop replication_mode setting
2024-05-13 12:59:23 +02:00
Jörg Thalheim
ba37bf5f3d
Merge pull request #307076 from flokli/caddy-reload
nixos/caddy: don't set ExecReload if enableReload is disabled
2024-05-13 10:45:28 +02:00
Yureka
aa64bb27ba nixos/garage: add assertion for replication_factor 2024-05-13 10:03:21 +02:00
Pol Dellaiera
378c5c67ed
Merge pull request #310348 from ehmry/nginx-validateConfigFile
nixos/nginx: add validateConfigFile option
2024-05-12 21:58:59 +02:00
Florian Klink
0244a8d5d7 nixos/caddy: don't set ExecReload if enableReload is disabled
Otherwise, setting services.caddy.enableReload to false fails in a very bad fashion:

The reload command still gets executed, but fails:

```
Apr 26 21:23:01 n1-rk1 systemd[1]: Reloading Caddy...
Apr 26 21:23:01 n1-rk1 caddy[70793]: {"level":"info","ts":1714166581.733018,"msg":"using provided configuration","config_file":"/etc/caddy/caddy_config","config_adapter":"caddyfile"}
Apr 26 21:23:01 n1-rk1 caddy[70793]: {"level":"warn","ts":1714166581.7353032,"msg":"Caddyfile input is not formatted; run 'caddy fmt --overwrite' to fix inconsistencies","adapter":"caddyfile","file":"/etc/caddy/caddy_config","line":3}
Apr 26 21:23:01 n1-rk1 caddy[70793]: Error: sending configuration to instance: performing request: Post "http://localhost:2019/load": dial tcp [::1]:2019: connect: connection refused
Apr 26 21:23:01 n1-rk1 systemd[1]: caddy.service: Control process exited, code=exited, status=1/FAILURE
Apr 26 21:23:01 n1-rk1 systemd[1]: Reload failed for Caddy.
```

… and the server is not restarted either, as a ExecReload= command is
specified.

Fix this, by only setting ExecReload if the reload exists.

The first empty string is still necessary to reset the old option.
2024-05-12 18:27:02 +03:00
Franz Pletz
b7d060d10d
nixos/nginx: fix reference to acme cert hostname
The change introduced in #308303 refers to the virtualHosts attrset
key which can be any string. The servername is the actual primary
hostname used for the certificate.

This fixes use cases like:

    services.nginx.virualHosts.foobar.serverName = "my.fqdn.org";
2024-05-10 01:36:34 +02:00
Emery Hemingway
60c75135f8 nixos/nginx: add validateConfigFile option
Add an option to disable configuration file processing and
validation.
2024-05-09 16:48:26 +02:00
Niklas Hambüchen
9d7a729277 treewide: ReadWriteDirectories -> ReadWritePaths.
These were renamed in systemd v231:
2a624c36e6
2024-05-07 01:06:02 +02:00
Florian Klink
8950e22d8c nixos/garage: drop replication_mode setting
This got broken up into separate `replication_factor` and
`consistency_mode` settings with Garage 1.x, and due to the the "none"
default kicking in, Garage fails to startup with

> : Error: Either the legacy replication_mode or replication_level and consistency_mode can be set, not both.

if we actually make the migratiom as documented in the migration guide.

Drop this explicit setting, so users can set replication_mode or
replication_factor/consistency_mode, depending on the version they're
using.
2024-05-06 23:15:10 +03:00
Niklas Hambüchen
7b6b627a66 nixos/caddy: Comment why ExecStart is reset 2024-05-06 03:18:29 +02:00
Lynn
a586e82ef6 nixos/nginx: don't add .well-known locations for acme when using DNS-01 challenge 2024-05-01 16:48:07 +02:00
Sandro Jäckel
8db512dae8 nixos/nginx: update ciphers list 2024-04-22 23:08:14 +10:00
Sandro
f417891699
Merge pull request #293954 from Dan-Theriault/refactor-tailscale-auth 2024-04-18 15:14:01 +02:00
Dan Theriault
3cf6c4ddb3 nixos/tailscale-auth: init module
This additional module allows the tailscale auth proxy to be configured
independently of nginx. The tailscale auth proxy works with both caddy
and traefik. All prior nginx/tailscale-auth options are retained as
aliases.
2024-04-16 19:06:08 -04:00
Kerstin Humm
d6e8934f38
nixos/nginx: allow for resolving IPv6 addresses only 2024-04-16 23:44:11 +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
Janne Heß
bc77c7a973 treewide: Mark Nix blocks in markdown as Nix
This should help us with highlighting and future formatting.
2024-03-28 09:28:12 +01:00
Lily Foster
e3c0bb4255
Merge pull request #294542 from Janik-Haag/garage
nixos/garage: add env-var wrapper for admin cli
2024-03-18 16:10:15 -07:00