10770 Commits

Author SHA1 Message Date
Niklas Hambüchen
df8bcca5fb
Merge pull request #128161 from NixOS/backport-128150-to-release-21.05
[Backport release-21.05] etcd: refactor the service to add etcd to systemPackages instead of the etcdctl alias
2021-06-27 14:28:07 +02:00
Alexandru Scvortov
733b7eedff etcd: fix old aliased package name to make tests pass
(cherry picked from commit e08b3f0c8580d1944c1e5a64d44b965c1499ddda)
2021-06-26 01:36:30 +00:00
Florian Klink
f4b92c2975 nixos/getty: add missing --keep-baud
systemd ships `units/serial-getty@.service.m4` with the `--keep-baud`
option.

We override that unit, and didn't add the `--keep-baud` option. (We have
it in our other getty options there).

Having `--keep-baud` in `serial-getty@` makes a lot of sense - the
console keeps working if it's initialized with a less standard baud
rate, such as the [Helios64](https://wiki.kobol.io/helios64/intro/).

(cherry picked from commit ba42d639f16dc774f4fa661243b640b034d7be0a)
2021-06-25 23:32:04 +02:00
talyz
d726b9c204 nixos/fail2ban: Remove reloadIfChanged = true
This makes the service fail when upgrading the package, so let's
properly restart it instead.

(cherry picked from commit b4c069b1476a92a540e906ef95cd7fb380d29c63)
2021-06-20 16:01:18 +00:00
Martin Weinelt
6ee61426da nixos/solanum: implement reload and allow config changes
Reload only works with a static configuration path as there is no way to
pass the dynamically generated config path to a running solanum
instance, therefore we symlink the configuration to
/etc/solanum/ircd.conf.

But that will prevent reloads of the ircd, because the systemd unit
wouldn't change when the configuration changes. That is why we add the
actual location of the config file to restartTriggers and enable
reloadIfChanged, so changes will not restart, but reload on changes.

(cherry picked from commit 60c62214f5a3c7db6aa30d8a8e02c863b6abcf0a)
2021-06-16 02:09:04 +02:00
lassulus
0a8684cadd solanum: remove obsolete BANDB settings/patches
(cherry picked from commit 8eb5701aaf0eb7ad842a67f09e2f80826ac1ce80)
2021-06-16 02:09:00 +02:00
Robert Hensing
91d03cd360 nixos/ssh: Document authorizedKeysFiles properly
(cherry picked from commit dab747106e20268e6d3a7c1a758185bc75507bef)
2021-06-15 19:42:28 +00:00
Robert Hensing
89ecb51a6a nixos/ssh: Add an example of verbatim keys
This confused someone on SO.

(cherry picked from commit 8352cc9a23a5fea11d467a5b8341b24cd162c62a)
2021-06-15 19:42:27 +00:00
Domen Kožar
57606ed0af
Merge pull request #126605 from NixOS/backport-125311-to-release-21.05
[Backport release-21.05] pipewire: 0.3.27 -> 0.3.30
2021-06-15 18:44:16 +02:00
talyz
d3d1674b3f gitlab: Make sure the FOSS version isn't identified as EE
(cherry picked from commit 8f16b1629155ad0022bb7830739081532d1bae50)
2021-06-15 15:16:10 +00:00
Vladimír Čunát
6d286be97a
Merge branch 'release-21.05' into staging-next-21.05
This brings not that many rebuilds but still some.
2021-06-12 07:21:42 +02:00
Bjørn Forsman
a0fc6a7861 nixos/jenkins-job-builder: add support for folder jobs
Add support for folder jobs
(https://plugins.jenkins.io/cloudbees-folder/) by reworking the service
to support nested jobs.

This also fixes this deprecation warning (as a happy side effect):

  WARNING:jenkins_jobs.cli.subcommand.test:(Deprecated) The default output behavior of `jenkins-jobs test` when given the --output flag will change in JJB 3.0. Instead of writing jobs to OUTPUT/jobname; they will be written to OUTPUT/jobname/config.xml. The new behavior can be enabled by the passing `--config-xml` parameter

(cherry picked from commit 4bcb22e17aa8677c6b3fc4625732d4da791a576f)
2021-06-11 23:08:41 +02:00
Jan Solanti
c2628780fc pipewire: 0.3.27 -> 0.3.30
(cherry picked from commit c702cc43213dce2573adb924ab9c67522616aea6)
2021-06-11 14:52:30 +00:00
Jonathan Ringer
8e20586f52
Merge branch 'staging-next-21.05' into staging-21.05 2021-06-08 12:21:49 -07:00
rnhmjoj
f2c9d568c8 nixos/wireless: only warn for no interfaces
A hard failure breaks the NixOS installer, which can't possibly
know the interface names in advance.

(cherry picked from commit be01320a6c39867eac0a20b4dfe04680d3b1ce26)
2021-06-08 08:52:41 -07:00
rnhmjoj
df9df54d63 Revert "nixos/wireless: make wireless.interfaces mandatory"
This reverts commit 030a521adc9510207dd9f06b8d8b552ff7d999f9.

(cherry picked from commit eba5f5c1e5a61ef65a970c699b9f93aff87448bf)
2021-06-08 08:52:41 -07:00
Jan Tojnar
403fb2db47 nixos/gnome: fix option label
It is no longer GNOME 3.

(cherry picked from commit 99fcca7b6bc850e1c1c47e9fbad41fc3264170f6)
2021-06-07 17:34:08 -07:00
rnhmjoj
662f2d19b3 nixos/wireless: make wireless.interfaces mandatory
This is the only way to solve issue #101963, for now.

(cherry picked from commit 030a521adc9510207dd9f06b8d8b552ff7d999f9)
2021-06-06 08:38:28 +00:00
talyz
a60818cacd treewide: Fix mysql alias deprecation breakage
62733b37b4a866cabafe1fc8bb7415240126eb0b broke evaluation in all
places `pkgs.mysql` was used. Fix this by changing all occurrences to
`pkgs.mariadb`.

(cherry picked from commit 59e0120aa5c1241d48048afa615e25c65d7e366d)
2021-06-05 17:11:40 +00:00
Maximilian Bosch
3c8dcd902a nixos/mail-exporter: add note about rspamd marking probe mails as spam
(cherry picked from commit ba9768f3143c728a47515d0548025a103fca9013)
2021-06-04 14:14:35 +00:00
Maximilian Bosch
d7fbcd60a3 nixos/dovecot-exporter: fix documentation for old stats
(cherry picked from commit 6fb847c55643780c1ba3a98c57ba57541ed33d14)
2021-06-04 14:14:35 +00:00
Maximilian Bosch
619cf60d25 nixos/rspamd-exporter: fix metrics
In 0.3.0 of the json-exporter[1] it was switched to a different jsonpath
library which made some changes - especially for spaces in keys -
necessary. Also I decided to remove the pretty-printed JSON as this
would interfere with the bash quoting too much. If one needs
pretty-printed output, they can still pipe the output to `jq`.

[1] https://github.com/prometheus-community/json_exporter/releases/tag/v0.3.0

(cherry picked from commit 976d668e5c5566c3e96b17d667830a0f3ed1bbb5)
2021-06-04 14:14:35 +00:00
Daniel Nagy
4d837a7a98 nixos/monero: set port type to types.port
(cherry picked from commit e57465a617f4cc993a7b32f90cb9e095f2b09596)
2021-06-01 13:15:25 +00:00
Daniel Nagy
ab496da138 nixos/gitlab: set port type to types.port
(cherry picked from commit cc5517da4c2221ee42163b69e1648cc472fcba0e)
2021-06-01 13:15:25 +00:00
Daniel Nagy
28e57cb0c7 nixos/matrix-synapse: set port type to types.port
(cherry picked from commit 8e760f485873d202a0ad4aba7a78caabc85cf5db)
2021-06-01 13:15:24 +00:00
Daniel Nagy
fda7b06830 nixos/syncserver: set port type to types.port
(cherry picked from commit 65b32a0afe69258e3fa2fb245ea2315c8683281f)
2021-06-01 13:15:24 +00:00
Daniel Nagy
2c97740c47 nixos/gitDaemon: set port type to types.port
(cherry picked from commit 048c45679fe6fda60b00bf45890e5990f0e6d9f2)
2021-06-01 13:15:24 +00:00
Daniel Nagy
98d6d1dbf7 nixos/redis: set port type to types.port
(cherry picked from commit 0cde374a7604821ceddd24d06ae21e44de59d04c)
2021-06-01 13:15:24 +00:00
Daniel Nagy
d71b353d15 nixos/discourse: set port type to types.port
(cherry picked from commit 73f9c29a2cd4e298493751ba1e3f1f5750021ad2)
2021-06-01 13:15:24 +00:00
Daniel Nagy
24e35b8c44 nixos/terraria: adapt option types
(cherry picked from commit 137924cc96b589c8d335ff4a420b0e3bb208ac9e)
2021-06-01 13:15:24 +00:00
Daniel Nagy
33ce03a653 nixos/lighttpd: set port type to types.port
(cherry picked from commit 941fd008ede8ad2423c257a18681011939d9fe11)
2021-06-01 13:15:23 +00:00
Daniel Nagy
dad9958503 nixos/darkhttpd: set port type to types.port
(cherry picked from commit a5321aecfb51c7abdd45254d821e8122820850d3)
2021-06-01 13:15:23 +00:00
Martin Weinelt
f4d6d51a09 nixos/wordpress: regenerate secret keys if misspelled key name is found
A secret key generated by the nixos module was misspelled, which could
possibly impact the security of session cookies.

To recover from this situation we will wipe all security keys that were
previously generated by the NixOS module, when the misspelled one is
found. This will result in all session cookies being invalidated. This
is confirmed by the wordpress documentation:

> You can change these at any point in time to invalidate all existing
> cookies. This does mean that all users will have to login again.

https://wordpress.org/support/article/editing-wp-config-php/#security-keys

Meanwhile this issue shouldn't be too grave, since the salting function
of wordpress will rely on the concatenation of both the user-provided
and automatically generated values, that are stored in the database.

> Secret keys are located in two places: in the database and in the
> wp-config.php file. The secret key in the database is randomly
> generated and will be appended to the secret keys in wp-config.php.

https://developer.wordpress.org/reference/functions/wp_salt/

Fixes: 2adb03fdaea6186299c6ff578bb6814d8f3bb30b ("nixos/wordpress:
generate secrets locally")

Reported-by: Moritz Hedtke <Moritz.Hedtke@t-online.de>
(cherry picked from commit 724ed08df02546fea2ab38613d615dd47461528c)
2021-05-29 20:16:47 +00:00
talyz
b423efaeeb nixos/discourse: Assert deployed PostgreSQL version
Assert that the PostgreSQL version being deployed is the one used
upstream. Allow the user to override this assertion, since it's not
always possible or preferable to use the recommended one.

(cherry picked from commit 544adbfcab2e92c2fe5774cae67f2edf165eb97e)
2021-05-28 22:16:10 -07:00
talyz
ce5587e7bb discourse: 2.6.5 -> 2.7.0
(cherry picked from commit 42b8e7685d5fe5280f8f6101a6d19016b92f3a5c)
2021-05-28 22:16:10 -07:00
Niklas Hambüchen
b73e47d3d7 nixos/wireguard: Remove .path systemd unit for privkey. Fixes #123203
As per `man systemd.path`:

> When a service unit triggered by a path unit terminates
> (regardless whether it exited successfully or failed),
> monitored paths are checked immediately again,
> **and the service accordingly restarted instantly**.

Thus the existence of the path unit made it impossible to stop the
wireguard service using e.g.

    systemctl stop wireguard-wg0.service

Systemd path units are not intended for program inputs such
as private key files.
This commit simply removes this usage; the private key is still
generated by the `generateKeyServiceUnit`.

(cherry picked from commit d344dccf3dc592242f11ef993acb9ecee8d84796)
2021-05-28 18:28:35 -07:00
Ivan Kozik
02daee80bc nixos/bitwarden_rs: fix startup on 32 thread machines
LimitNPROC=64 is too low for bitwarden_rs to start on a 32 thread machine.
Remove the limit.

This fixes:

```
bitwarden_rs[38701]: /--------------------------------------------------------------------\
bitwarden_rs[38701]: |                       Starting Bitwarden_RS                        |
bitwarden_rs[38701]: |--------------------------------------------------------------------|
bitwarden_rs[38701]: | This is an *unofficial* Bitwarden implementation, DO NOT use the   |
bitwarden_rs[38701]: | official channels to report bugs/features, regardless of client.   |
bitwarden_rs[38701]: | Send usage/configuration questions or feature requests to:         |
bitwarden_rs[38701]: |   https://bitwardenrs.discourse.group/                             |
bitwarden_rs[38701]: | Report suspected bugs/issues in the software itself at:            |
bitwarden_rs[38701]: |   https://github.com/dani-garcia/bitwarden_rs/issues/new           |
bitwarden_rs[38701]: \--------------------------------------------------------------------/
bitwarden_rs[38701]: [INFO] No .env file found.
bitwarden_rs[38701]: [2021-05-24 03:34:41.121][bitwarden_rs::api::core::sends][INFO] Initiating send deletion
bitwarden_rs[38701]: [2021-05-24 03:34:41.122][start][INFO] Rocket has launched from http://127.0.0.1:8222
bitwarden_rs[38701]: [2021-05-24 03:34:41.126][panic][ERROR] thread 'unnamed' panicked at 'failed to spawn thread: Os { code: 11, kind: WouldBlock, message: "Resource temporarily unavailable" }': /build/rustc-1.52.1-src/library/std/src/thread/mod.rs:620
bitwarden_rs[38701]:    0: bitwarden_rs::init_logging::{{closure}}
bitwarden_rs[38701]:    1: std::panicking::rust_panic_with_hook
bitwarden_rs[38701]:    2: std::panicking::begin_panic_handler::{{closure}}
bitwarden_rs[38701]:    3: std::sys_common::backtrace::__rust_end_short_backtrace
bitwarden_rs[38701]:    4: rust_begin_unwind
bitwarden_rs[38701]:    5: core::panicking::panic_fmt
bitwarden_rs[38701]:    6: core::result::unwrap_failed
bitwarden_rs[38701]:    7: hyper::server::listener::spawn_with
bitwarden_rs[38701]:    8: hyper::server::listener::ListenerPool<A>::accept
bitwarden_rs[38701]:    9: std::sys_common::backtrace::__rust_begin_short_backtrace
bitwarden_rs[38701]:   10: core::ops::function::FnOnce::call_once{{vtable.shim}}
bitwarden_rs[38701]:   11: std::sys::unix:🧵:Thread:🆕:thread_start
bitwarden_rs[38701]:   12: start_thread
bitwarden_rs[38701]:   13: __GI___clone
bitwarden_rs[38701]: [2021-05-24 03:34:41.126][panic][ERROR] thread 'main' panicked at 'internal error: entered unreachable code: the call to `handle_threads` should block on success': /build/bitwarden_rs-1.20.0-vendor.tar.gz/rocket/src/rocket.rs:751
bitwarden_rs[38701]:    0: bitwarden_rs::init_logging::{{closure}}
bitwarden_rs[38701]:    1: std::panicking::rust_panic_with_hook
bitwarden_rs[38701]:    2: std::panicking::begin_panic_handler::{{closure}}
bitwarden_rs[38701]:    3: std::sys_common::backtrace::__rust_end_short_backtrace
bitwarden_rs[38701]:    4: rust_begin_unwind
bitwarden_rs[38701]:    5: core::panicking::panic_fmt
bitwarden_rs[38701]:    6: rocket:🚀:Rocket::launch
bitwarden_rs[38701]:    7: bitwarden_rs::main
bitwarden_rs[38701]:    8: std::sys_common::backtrace::__rust_begin_short_backtrace
bitwarden_rs[38701]:    9: std::rt::lang_start::{{closure}}
bitwarden_rs[38701]:   10: std::rt::lang_start_internal
bitwarden_rs[38701]:   11: main
```

(cherry picked from commit d95960e2755c1c2a8913cc27d0daada84c0c560c)
2021-05-28 11:36:54 -07:00
Michael Lingelbach
676ddafd3d
nixos/dendrite: remove (#124524)
* The options tlsKey and tlsCert require being accessible by DynamicUser at runtime, which currently requires copying the files into the matrix service state directory. Fixing this might require breaking changes. Thus the module should not be included in a stable release.
2021-05-27 10:41:05 +02:00
Sandro Jäckel
0b4994f714 nixos/kresd: tell resolveconf to use local resolver
(cherry picked from commit 140828ce3843444a8536db884147ed5c4b941259)
2021-05-26 17:24:55 +02:00
regnat
0cebbdf687
Revert "nixos/nix-daemon: fix sandbox-paths option"
This reverts commit aeeee447bcc181d57a19d348f857326f4e1959fe.

(cherry picked from commit 113823669b9b71fff84bc592d1fd6022635c28eb)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-05-24 15:20:58 +02:00
Jonathan Ringer
11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
Martin Weinelt
84f649f693
Merge pull request #121626 from mweinelt/botamusique 2021-05-23 02:02:09 +02:00
Martin Weinelt
59e5ff4b29
nixos/botamusique: init 2021-05-23 01:01:51 +02:00
Jan Tojnar
aea7b5f08e
Merge pull request #124073 from mkg20001/cinnamonpolkit
nixos/cinnamon: add polkit_gnome to fix #124062
2021-05-23 00:21:28 +02:00
Jan Tojnar
141e85cc69
Merge pull request #124056 from mkg20001/cinnamonlocale
nixos/cinnamon: add cinnamon-translations to systemPackages
2021-05-23 00:21:11 +02:00
Maciej Krüger
eca2b05354
nixos/cinnamon: add cinnamon-translations to systemPackages
This allows other cinnamon applications to use the locales

Without this the cinnamon UI is not properly translated
2021-05-22 23:59:33 +02:00
Maciej Krüger
8664c2c743
nixos/cinnamon: add polkit_gnome to fix #124062 2021-05-22 23:58:06 +02:00
Maximilian Bosch
278bcdce1f
Merge pull request #123941 from mweinelt/matrix-synapse
nixos/matrix-synapse: protect created files
2021-05-22 22:20:16 +02:00
Martin Weinelt
79e675444c
nixos/matrix-synapse: protect created files
Enforce UMask on the systemd unit to restrict the permissions of files
created. Especially the homeserver signing key should not be world
readable, and media is served through synapse itself, so no other user
needs access to these files.

Use a prestart chmod to fixup the permissions on the signing key.
2021-05-22 20:30:49 +02:00
Sandro
7be85b5090
Merge pull request #104420 from danielfullmer/syncoid-perm-fix 2021-05-22 17:57:56 +02:00