Commit Graph
17405 Commits
Author SHA1 Message Date
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
Natan Lao b3ec6fd959 nixos/nvidia: fix hardware.nvidia.package example
(cherry picked from commit 86a31cc9719ed409d523d4f738aa2a994d79ff9e)
2021-06-08 20:59:02 -07: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
AmineChikhaoui 77e8ea81e3 ec2-amis: add release 21.05
(cherry picked from commit b7d74194b49c3b3f85d52e85054283211bce6c11)
2021-06-06 17:09:30 -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
62733b37b4 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
Samuel Dionne-Riel 7953561a9d iso-image: Improve disk detection
This should help in rare hardware-specific situations where the root is
not automatically detected properly.

We search using a marker file. This should help some weird UEFI setups
where the root is set to `(hd0,msdos2)` by default.

Defaulting to `(hd0)` by looking for the ESP **will break themeing**. It
is unclear why, but files in `(hd0,msdos2)` are not all present as they
should be.

This also fixes an issue introduced with cb5c4fcd3c
where rEFInd stopped booting in many cases. This is because it ended up
using (hd0) rather than using the `search` which was happening
beforehand, which in turn uses (hd0,msdos2), which is the ESP.
Putting back the `search` here fixes that.

(cherry picked from commit 20b023b5ea63a6513a4dce7f162736a00bce5cc8)
2021-06-03 08:03:07 -07:00
Samuel Dionne-Riel 2f5e4928c0 iso-image: unqualified root → ($root)
This technically changes nothing. In practice `$root` is always the
"CWD", whether searched for automatically or not.

But this serves to announce we are relying on `$root`... I guess...

(cherry picked from commit c9bb054dd68964b0eb9a38c51bdf824bfb212fc7)
2021-06-03 08:03:07 -07:00
Samuel Dionne-Riel 190f44da28 iso-image: change date on all files
It may be that in some conditions dates earlier than 1980 on FAT on GRUB
2.06~ish will cause failures

https://github.com/NixOS/nixpkgs/issues/123376#issuecomment-845515035
(cherry picked from commit 15eaed0718515db3f2fa7d4ed71676e6069d3fb5)
2021-06-03 08:03:07 -07:00
Samuel Dionne-Riel 8cb2ce0f52 iso-image: Force gfxmode
https://www.gnu.org/software/grub/manual/grub/html_node/gfxmode.html
(cherry picked from commit f93f0e72e9ef423ed591951030f08cafd209e637)
2021-06-03 08:03:07 -07:00
zowoq 0684f78698 nixos/podman-network-socket-ghostunnel: move condition to include socket
(cherry picked from commit 72f54c32a6114a69caec30170a29837c91434aff)
2021-06-02 10:20:11 +02:00
Robert Hensing c758b69375 nixos/podman-dnsname: init
(cherry picked from commit 54f2f1e5f1c7fd34e564a84443e8490477e26eb7)
2021-06-02 10:20:11 +02:00
Robert Hensing 9e4729617b nixos/podman: Add defaultNetwork.extraPlugins
(cherry picked from commit d81631fb98ea35b107d86f5de287cf727d0dfc18)
2021-06-02 10:20:11 +02:00
Robert Hensing f28df17dfa nixos/containers: Add virtualisation.containers.containersConf.cniPlugins
(cherry picked from commit efba949352271ec77d9d5e7d54f2d16b9c53ee4f)
2021-06-02 10:20:11 +02:00
Robert Hensing 833b005e37 nixos/podman-network-socket-ghostunnel: init
(cherry picked from commit b6570e723836167640c9b7efc63f327ff17b0755)
2021-06-02 10:20:10 +02:00
Robert Hensing ffde2bb4a1 nixos/podman: Add generic networkSocket interface
(cherry picked from commit 52844efcd67028a481a24103d8e93c7ef2bf4f08)
2021-06-02 10:20:10 +02:00
Robert Hensing 0c5e6d0bea nixos/podman: Add dockerSocket.enable
(cherry picked from commit ff4d83a66727ad13da0f51d00db4eda8a8c50590)
2021-06-02 10:20:10 +02:00
Robert Hensing db05ed8b0d nixos/podman: Change podman socket to new podman group
(cherry picked from commit fb8b0a38433c8e83a53c1dc0a739c5a7ad64e2fc)
2021-06-02 10:20:10 +02:00
zowoq f63aff597b nixos/podman: install cni config from package
(cherry picked from commit 30ae7e4ba983de461c7b71d02274d184ab55244d)
2021-06-02 10:20:10 +02:00
Julien Moutinho 437b2bfe18 nixos/pam: use new plasma5Packages, fixes #124973
(cherry picked from commit 61654ca131c1431b172cc0464c83227c40331e16)
2021-06-01 13:30:11 +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
Vincent Bernat cbe0e663ec nixos/acme: don't use --reuse-key
Reusing the same private/public key on renewal has two issues:

 - some providers don't accept to sign the same public key
   again (Buypass Go SSL)

 - keeping the same private key forever partly defeats the purpose of
   renewing the certificate often

Therefore, let's remove this option. People wanting to keep the same
key can set extraLegoRenewFlags to `[ --reuse-key ]` to keep the
previous behavior. Alternatively, we could put this as an option whose
default value is true.

(cherry picked from commit 632c8e1d54e299f656aa677f25552e1127f12849)
2021-05-31 23:02:21 +00:00
Janne Heß 4f9eadefdc Update nixos/modules/virtualisation/libvirtd.nix
Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
(cherry picked from commit 964fc7cfef94bd598d816979a4ca1a42d9753d23)
2021-05-30 14:56:41 +00:00
Janne Heß c072a18797 nixos/libvirtd: Take ethertypes from iptables-nftables-compat
iptables is currently defined in `all-packages.nix` to be
iptables-compat. That package does however not contain `ethertypes`.
Only `iptables-nftables-compat` contains this file so the symlink
dangles.

(cherry picked from commit 2eeecef3fc70e35b2f4c6d8424e4c726c140e330)
2021-05-30 14:56:41 +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: 2adb03fdae ("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