Commit Graph

20737 Commits

Author SHA1 Message Date
stuebinm
b5af071946 services/nextcloud: apply suggestions from PR 118093 2022-04-24 15:48:00 +02:00
stuebinm
a8ecb909c0
nixos/nextcloud: fixed secretFile example 2021-08-01 20:47:38 +02:00
stuebinm
64e943d4a2
nixos/nextcloud: test for secretFile option
This is a dummy test that doesn't do much — the secretFile option is
just used to set the database type to postgres; otherwise this is an
exact copy of the with-postgresql-and-redis.nix test, though with the
redis components removed.
2021-08-01 20:45:24 +02:00
stuebinm
164f8c9457
nixos/nextcloud: deduplicate file reading
This combines the two functions nix_read_pwd and nix_read_secrets into a
single function nix_read_file, which takes two arguments: the file to be
read, and an error message that should be printed if reading the file
failed.
2021-08-01 20:39:29 +02:00
stuebinm
83a669a0be
nixos/nextcloud: better json typechecking
this now uses the pkgs.formats.json instead of the builtin function to
serialise json, which comes with a type signature that we can pass to mkOptions
2021-03-31 14:56:14 +02:00
stuebinm
727bdd736c
nixos/nextcloud: use array_merge instead of array_push
This should correctly merge the various configs (via nix module options,
the secretFile option, and the extraOptions option).
2021-03-31 14:52:45 +02:00
stuebinm
fb389cb0db
nixos/nextcloud: add test for declaratively defined redis
This is based on the test using redis and postgresql, but it does not
require any imperative configuration after startup; everything is defined
via Nix instead.
2021-03-30 20:09:29 +02:00
stuebinm
4ca2f27a60
nixos/nextcloud: allow more declarative config
This adds two options to the nextcloud module, with the aim of allowing
the entirety of `config.php` to be set declaratively:
1. `services.nextcloud.extraOptions`, which takes free-form options
   given as an attribute set, and reads them in via json from the php
   side (which lets us prevent syntax errors in php, if not key errors –
   given the full length of nextcloud's potential options, I don't think
   specifying them all via Nix is a viable option)
2. `services.nextcloud.secretFile`, which takes a path to a json file
   specifying options which a user may want to keep secret and not add
   to their nix store; this file is read in the same way on startup by
   php, and may even overwrite options set in some other way.
2021-03-30 20:07:50 +02:00
Sandro
7d0dad76ef
Merge pull request #116936 from hercules-ci/logstash-jdk 2021-03-30 17:22:21 +02:00
Philip Munksgaard
299d054a7f
bitwarden_rs: 1.19.0 -> 1.20.0 (#117931)
* bitwarden_rs: 1.19.0 -> 1.20.0

* bitwarden_rs: Fix failing integration tests
2021-03-30 00:33:00 +02:00
Doron Behar
c2b66f2702
Merge pull request #98734 from ju1m/zerobin 2021-03-29 17:18:29 +00:00
Jörg Thalheim
96e4052d70
nixos/hydra: gc-check-reachability no longer exists in nix 2.4 (#117925)
* nixos/hydra: gc-check-reachability no longer exists in nix 2.4

fixup! nixos/hydra: gc-check-reachability no longer exists in nix 2.4

* Update nixos/modules/services/continuous-integration/hydra/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-03-29 11:14:16 +02:00
Peter Hoeg
860e87d363 nixos/geoclue2: do not start geoclue agent for system users 2021-03-29 16:57:49 +08:00
Sandro
da7bf30372
nixos/containers: update example path to match defaults 2021-03-29 03:40:44 +02:00
Maximilian Bosch
c2836eb953
Merge pull request #117809 from mayflower/graylog-4
graylog: improve JRE handling
2021-03-28 23:47:26 +02:00
Doron Behar
9d47c33ee0
Merge pull request #82005 from esclear/mpd-socket
nixos/mpd: allow autostart when listening for unix socket
2021-03-28 20:04:31 +00:00
Sander van der Burg
b8258843d4 nixos/misc/ids: reclaim uid for disnix 2021-03-28 21:40:44 +02:00
Sander van der Burg
13b367df5f nixos/dysnomia: configure systemd unit path 2021-03-28 21:39:23 +02:00
Sander van der Burg
4ae1fa61ad Revert "nixos/dysnomia nixos/disnix: Drop modules"
This reverts commit a3f4db8679.
2021-03-28 21:37:43 +02:00
Vladimír Čunát
56f308bb2f
nixos/kresd: trivial cleanup 2021-03-28 21:01:50 +02:00
Vladimír Čunát
6e562fd6a7
Merge #101043: nixos/kresd: Listen on IPv4 wildcard, too
This makes sense to me.  I can't see any reference (incl. PR #78628)
why that commit of mine (ae74a0e27c) used 127.0.0.1 instead of 0.0.0.0
2021-03-28 20:53:33 +02:00
Vladimír Čunát
0032a3fc81
Merge #100592: nixos/kresd: Fix unportable regex 2021-03-28 20:27:49 +02:00
oxalica
80a1336bb9 nixos/filesystems: always write mount options for swap devices
According to fstab(5), unlike last two fields `fs_freq` and `fs_passno`,
the 4-th field `fs_mntops` is NOT optional, though it works when omitted.

For best-practice and easier to be parsed by other programs, we should always
write `defaults` as default mount options for swap devices.
2021-03-28 19:54:03 +02:00
Aaron Andersen
d6fd7c6613 nixos/zabbixAgent: add a few minor tweaks to make configuration file compatible with both zabbix agent 1 and 2 2021-03-28 13:35:21 -04:00
Linus Heckemann
4aacd02d33
Merge pull request #115792 from ncfavier/patch-2
nixos/stage-1: make cpio quiet
2021-03-28 14:38:46 +02:00
Linus Heckemann
22de3c19e7 graylog: improve JRE handling
Since the upstream graylogctl script will prefer finding its java
executable based on JAVA_HOME, we now set this instead of PATH in
order to allow it to find the JRE. By setting it conditionally on it
not already being set, we allow selecting a different JRE at runtime.

We also explicitly use openjdk11, which supports the
UseConcMarkSweepGC option which graylog insists on using.
2021-03-28 14:37:28 +02:00
Maximilian Bosch
ae73ec2b68
Merge pull request #116738 from Ma27/wiki-js
wiki-js: init at 2.5.191
2021-03-27 22:03:35 +01:00
Michele Guerini Rocco
b01e00ba8f
Merge pull request #114688 from rnhmjoj/tcsd-no-udev-settle
nixos/tcsd: several improvements and fixes
2021-03-27 16:31:17 +01:00
Justin Humm
347a9168ae nixos/hledger-web: set capabilites as boolean 2021-03-26 13:45:13 +01:00
Justin Humm
569940b9fd nixos/hledger-web: add stateDir, use own user, fix ExecStart
This allows for shared hledger installations, where the web interface is
available via network and multiple user share a SSH access to the
hledger user.

Also added `--serve` to the CLI options, as hledger-web tries to open a
webbrowser otherwise:

hledger-web: xdg-open: rawSystem: runInteractiveProcess: exec: does not
exist (No such file or directory)

Co-authored-by: Aaron Andersen <aaron@fosslib.net>
2021-03-26 13:45:13 +01:00
Maciej Krüger
c8d2f4a3a8 cjdns: reduce password length to 32
Maximum password length per cjdns code is somehwhere less than that, see
ecd01e7681/client/AdminClient.c (L80)

Currently we generate 96 char long passwords that don't work

This changes it so password length is just 32 chars long
2021-03-26 11:35:09 +01:00
Robert Hensing
363d7c86b0
Merge pull request #117603 from lbpdt/fix/docker-tools-layered-image-env
dockerTools.streamLayeredImage: resolve duplicate env vars
2021-03-26 09:52:18 +01:00
Louis Blin
b3f68289df dockerTools.streamLayeredImage: resolve duplicate env vars
For images running on Kubernetes, there is no guarantee on how duplicate
environment variables in the image config will be handled. This seems
to be different from Docker, where the last environment variable value
is consistently selected.

The current code for `streamLayeredImage` was exploiting that assumption
to easily propagate environment variables from the base image, leaving
duplicates unchecked. It should rather resolve these duplicates to
ensure consistent behavior on Docker and Kubernetes.
2021-03-25 23:29:54 +00:00
Florian Klink
f3fa3a38a9
Merge pull request #116743 from flokli/bird-check-config-disable
nixos/bird*: enable config files outside the store, propagate reload errors to systemd
2021-03-25 23:01:09 +01:00
Domen Kožar
b992a92fa0
Merge pull request #117021 from AmineChikhaoui/gcp-cloud-images
add new Google Cloud image for the current release
2021-03-25 10:42:06 +01:00
Léo Gaspard
219ee8d091
release notes: typo fixes (#117539) 2021-03-25 01:28:41 +01:00
kvtb
5e647319ae less.nix: fix escape
$$ does not escape $
\$ does
2021-03-24 23:28:04 +01:00
Izorkin
f3a032dee5 nixos/mastodon: enable sandbox mode 2021-03-24 17:28:50 +01:00
Maximilian Bosch
0ad1d526dc
Merge pull request #117454 from dotlambda/wireguard-noalias
nixos/wireguard: don't use alias
2021-03-24 11:43:13 +01:00
Robert Schütz
683f374529 nixos/wireguard: don't use alias 2021-03-24 11:27:36 +01:00
Robert Hensing
43b02818f6
Merge pull request #117273 from hercules-ci/nixos-dont-format
Don't format XML of the NixOS manual
2021-03-24 11:07:23 +01:00
Benjamin Hipple
561cc81ee6
Merge pull request #115857 from lbpdt/feature/docker-tools-layered-base-image
dockerTools.buildLayeredImage: support fromImage
2021-03-23 18:15:34 -04:00
Robert Hensing
e0e241c219
Merge pull request #116369 from m1cr0man/master
nixos/acme: Fix webroot issues
2021-03-23 21:31:42 +01:00
Louis Blin
aae8588182 dockerTools.buildLayeredImage: support fromImage
It is now possible to pass a `fromImage` to `buildLayeredImage` and
`streamLayeredImage`, similar to what `buildImage` currently supports.

This will prepend the layers of the given base image to the resulting
image, while ensuring that at most `maxLayers` are used. It will also
ensure that environment variables from the base image are propagated
to the final image.
2021-03-23 14:50:42 +00:00
Robert Hensing
9011d59758 logstash-*-oss: Add passthru.tests 2021-03-23 14:42:40 +01:00
Robert Hensing
e7e6e8d5c3 nixos/logstash: Don't set unnecessary JAVA_HOME 2021-03-23 14:42:40 +01:00
Profpatsch
c25ffa8b76
Merge pull request #117073 from sternenseemann/inspircd-3.9.0
inspircd: init at 3.9.0
2021-03-23 11:25:58 +01:00
Peter Hoeg
6b815bbb99 nixos/systemd: missing a few units for KDE to use systemd 2021-03-23 09:44:34 +08:00
Sander van der Burg
8fc9423565
Merge pull request #116455 from svanderburg/systemdunitpath
systemd: allow custom unit folders to be configured with SYSTEMD_UNIT…
2021-03-22 22:58:49 +01:00
Robert Hensing
2f7be87a8a nixos/doc: Update Writing Documentation to use nix-shell 2021-03-22 21:21:08 +01:00