10791 Commits

Author SHA1 Message Date
Niklas Hambüchen
0a532d8b22
Merge pull request #128818 from NixOS/backport-128546-to-release-21.05
[Backport release-21.05] kubernetes: make tests pass by fixing a conntrack-tools dep and a missing dir
2021-07-27 16:18:00 +02:00
Luke Granger-Brown
17b1b28402
Merge pull request #130978 from NixOS/backport-124799-to-release-21.05
[Backport release-21.05] nixos/unbound: fix define-tag option
2021-07-25 10:14:27 +01:00
Valentin Conrad
6a09c14a33 nextcloud: remove expires header
nextcloud default nginx config did not include the expires config
see: https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html

(cherry picked from commit ceef268c4b8cca80bd8c9b73bc2b323be13e0970)
2021-07-23 10:33:24 +00:00
Marc 'risson' Schmitt
49cd45c508 nixos/unbound: fix define-tag option
Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
(cherry picked from commit 6b12cff0b5746af364066d1bcb2bc2563e978aa8)
2021-07-21 20:12:10 +00:00
Jan Tojnar
63ee5cd99a nixos/ddccontrol: init
(cherry picked from commit fc1e0e863c60dc9740304de36ffa883cbaddd760)
2021-07-20 22:32:07 -04:00
talyz
23c806f963 nixos/discourse: Update plugin documentation
Update the documentation regarding plugins to reflect recent changes.

(cherry picked from commit 20548f050e72a789ebbfe413b0fe7aa815e55c27)
2021-07-15 12:54:00 +00:00
Kim Lindberger
5fd730e210
Merge pull request #128823 from NixOS/backport-127931-to-release-21.05
[Backport release-21.05] discourse: Fix plugin support
2021-07-15 14:50:11 +02:00
Jörg Thalheim
eacc0f7750 k3s: add tokenFile option
To avoid having secrets in the nix store.

(cherry picked from commit 11a38f62f0bfcb655e339498897b0d25ac37fa97)
2021-07-15 12:40:46 +00:00
Jörg Thalheim
d15de4c6db nixos/k3s: add to environment.systemPackages for adminstration
(cherry picked from commit 852739337bd5ab4c57fd1eab9e62e76ac2f1a7cc)
2021-07-15 12:40:46 +00:00
Yureka
d36cd9e039 nixos/gitlab: improve psql assertion message
(cherry picked from commit c5a0551dc49b287d12d043298f9b7a4c8c355885)
2021-07-13 15:27:21 +02:00
Yureka
e4deb36262 nixos/gitlab: require at least postgresql 12
(cherry picked from commit 2297eb35e5b92f657b85dfe4ee535e2323e360c1)
2021-07-13 15:27:21 +02:00
Maximilian Bosch
f8b79de69e
nextcloud22: init at 22.0.0
Simplified, non-breaking version of e05f4101c16f08058a14ac4335886567e1ffe987.
2021-07-12 23:27:57 +02:00
illustris
fa8a6d7e0a nixos/jitsi-meet: include jitsi prosody plugins in prosody extraPluginPaths
(cherry picked from commit e0089c38ca2f9f2b9a46ffcf74a9908f53d51459)
2021-07-10 00:02:59 +02:00
illustris
27d38294c6 nixos/jitsi-meet: Update jitsi prosody configs
Changes made as per b6f7f8fba7

(cherry picked from commit 34b9ba2e6161e68febe4312c96c089d707472d5e)
2021-07-10 00:02:59 +02:00
Robert Hensing
809cc5bf28 nixos/postgresqlBackup: Only replace backup when successful
Previously, a failed backup would always overwrite ${db}.sql.gz,
because the bash `>` redirect truncates the file; even if the
backup was going to fail.
On the next run, the ${db}.prev.sql.gz backup would be
overwritten by the bad ${db}.sql.gz.

Now, if the backup fails, the ${db}.in-progress.sql.gz is in an
unknown state, but ${db}.sql.gz will not be written.
On the next run, ${db}.prev.sql.gz (our only good backup) will
not be overwritten because ${db}.sql.gz does not exist.

(cherry picked from commit 81c8189a841728a813bcde8604b80427fcf33522)
2021-07-07 23:45:22 +00:00
Robert Hensing
44c232bbeb nixos/postgresqlBackup: Use PATH for readability
(cherry picked from commit c586e42763e0f093d16b4b655759cb340171ad42)
2021-07-07 23:45:22 +00:00
Philipp Hausmann
d2352585bc slimserver: Fix user creation
(cherry picked from commit 8bfd84cf3c63b32299430cb15e53501922af893c)
2021-07-02 10:58:22 +00:00
Aaron Andersen
0315b6a3c7 zabbixAgent: add bash to $PATH
(cherry picked from commit a0a11fd22c5786aa7c0f025115506c6a83221951)
2021-07-01 03:11:24 +00:00
talyz
3b84448e67 discourse: Fix plugin support
For plugins to work properly, their assets need to be precompiled
along with the rest of Discourse's assets. This means we need to build
new packages when the list of plugins change.

(cherry picked from commit 9af3672f4faaafba0ce0129a87fc7925c14eeb61)
2021-06-30 22:07:25 +00:00
Alexandru Scvortov
3ee32f0ea9 kubernetes: fix conntrack-tools package name, missing dir, and tests
(cherry picked from commit ab1567e8121dfcdb4f7a395b39a3a345f41c7474)
2021-06-30 21:26:24 +00:00
Dima
892a6d4ce6 nixos/duplicity: fix typo in subcommand
In https://github.com/NixOS/nixpkgs/pull/120622 cleanup options were
added, but `remove-all-inc-of-but-n-full` was misspelled and as such
was not functioning.

(cherry picked from commit 0a977cf125a86b5580de6e05bfeaa07aa54c4a78)
2021-06-27 16:38:12 +00:00
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