1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00
Commit graph

28252 commits

Author SHA1 Message Date
github-actions[bot] d31202e8c3
Merge staging-next into staging 2022-07-25 12:02:27 +00:00
github-actions[bot] ded08eff9c
Merge master into staging-next 2022-07-25 12:01:46 +00:00
Maximilian Bosch f923f5b9aa
Merge pull request #182456 from mayflower/crowd-secrets
nixos/crowd: store openid password securely
2022-07-25 12:02:57 +02:00
github-actions[bot] a5a3f67b15
Merge staging-next into staging 2022-07-25 00:03:30 +00:00
github-actions[bot] e706db2a81
Merge master into staging-next 2022-07-25 00:02:44 +00:00
Mario Rodas f97827178e
Merge pull request #181021 from melvyn2/patch-1
Add `bash` to netdata service path
2022-07-24 16:12:07 -05:00
Vladimír Čunát 687d59d7e6
Merge branch 'master' into staging-next 2022-07-24 22:27:27 +02:00
Sandro 8f89704410
Merge pull request #182648 from SuperSandro2000/hedgedoc-module
nixos/hedgedoc: improve ldap settings
2022-07-24 16:33:11 +02:00
github-actions[bot] 4a6e124c33
Merge staging-next into staging 2022-07-24 12:02:06 +00:00
github-actions[bot] 21a6aafb7d
Merge master into staging-next 2022-07-24 12:01:21 +00:00
pennae ff56c775c8
Merge pull request #182098 from pennae/option-doc-md
convert some varlists in option docs to MD
2022-07-24 13:14:40 +02:00
Michael Weiss a4c8c46831
Merge pull request #182508 from primeos/signal-desktop
nixos/tests/signal-desktop: Fix the sqlite3 part of the test (regressed)
2022-07-24 12:27:38 +02:00
Felix Buehler 17e93b090e services.murmur: add openFirewall option 2022-07-24 10:32:37 +02:00
Vladimír Čunát 4ba8bc7d40
Merge branch 'master' into staging-next 2022-07-24 09:44:09 +02:00
Sandro Jäckel 98f180b0e3
nixos/hedgedoc: set good default for ldap.tlsca 2022-07-24 04:08:18 +02:00
Sandro Jäckel 1a7f6b4070
nixos/hedgedoc: do not require to set searchAttributes when ldap login is used 2022-07-24 04:08:18 +02:00
kilianar 2133278f96 nixosTests.podgrab: fix failing test
defaultPort and customPort aren't python variables causing the test to
fail. We instead use the nix variables with string interpolation.
2022-07-23 17:19:01 +02:00
github-actions[bot] b38a1818bc
Merge staging-next into staging 2022-07-23 12:02:12 +00:00
github-actions[bot] 6629a2339e
Merge master into staging-next 2022-07-23 12:01:31 +00:00
Bjørn Forsman 65399c4742 nixos/syncthing: don't leak the secret API key in process listings 2022-07-23 13:59:11 +02:00
Bjørn Forsman 16108ff74a nixos/jenkins-job-builder: set serviceConfig.Type = "oneshot"
This change allows detecting configuration errors during
switch-to-configuration instead of them being reported asynchronously
*after* switch-to-configuration has exited.

(And update the NixOS test accordingly.)
2022-07-23 13:30:53 +02:00
github-actions[bot] f036546286
Merge staging-next into staging 2022-07-23 06:02:03 +00:00
github-actions[bot] 1ce437589a
Merge master into staging-next 2022-07-23 06:01:20 +00:00
Shamrock Lee c25543b554 wineWowPackages: default mainProgram to "wine64" 2022-07-22 22:45:44 +00:00
Michael Weiss 59de06d093
nixos/tests/signal-desktop: Fix the sqlite3 part of the test (regressed)
Due to recent changes (likely a sqlite3 update) the sqlite3 meta-command
did suddenly succeed while sqlite3 is still unable to read the still
encrypted database. It just prints the following output and doesn't
seem to try to open/read the DB (which would fail):
```
main: /home/alice/.config/Signal/sql/db.sqlite r/w
```

We can simply fix this "regression" by instructing sqlite3 to list the tables
in the database (which fails because it cannot read the encrypted DB):
```
machine: must fail: su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables'
machine # [   47.036720] su[1178]: Successful su for alice by root
machine # [   47.041049] su[1178]: pam_unix(su:session): session opened for user alice(uid=1000) by (uid=0)
machine # Error: file is not a database
machine # [   47.116070] su[1178]: pam_unix(su:session): session closed for user alice
(finished: must fail: su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables', in 0.12 seconds)
```

Fix #181463.
2022-07-22 23:42:55 +02:00
github-actions[bot] b4832bac52
Merge staging-next into staging 2022-07-22 15:34:59 +00:00
Artturin 6789222b1c Merge branch 'master' into staging-next 2022-07-22 18:23:16 +03:00
Jörg Thalheim 8807057296 nixos/openldap: drop myself as maintainer 2022-07-22 16:54:13 +02:00
Sandro 8455ba6d64
Merge pull request #181258 from SuperSandro2000/onlyoffice 2022-07-22 16:28:13 +02:00
Martin Weinelt b5e4c14806 Merge remote-tracking branch 'origin/master' into staging-next 2022-07-22 14:56:01 +02:00
pennae e4d4b3cd64
Merge pull request #182441 from leungbk/lemmy-whitespace
services/web-apps/lemmy.nix: Remove space that causes a type error
2022-07-22 14:30:23 +02:00
Maximilian Bosch 200ce70e63
Merge pull request #180603 from m-bdf/substitute-nix-instantiate
nixos-generate-config: substitute nix-instantiate
2022-07-22 14:22:52 +02:00
Maximilian Bosch 779853b52b
Merge pull request #182413 from NetaliDev/pam-mount-fix-refactor
nixos/pam: refactor pam_mount unmounting fix
2022-07-22 14:05:44 +02:00
github-actions[bot] dec2508b80
Merge staging-next into staging 2022-07-22 12:02:21 +00:00
github-actions[bot] a3ba713cd4
Merge master into staging-next 2022-07-22 12:01:35 +00:00
Maximilian Bosch ee2413c326
nixos/crowd: store openid password securely 2022-07-22 13:13:12 +02:00
Maximilian Bosch 1f6910b7dd
Merge pull request #182267 from mayflower/confluence-secrets
nixos/confluence: store crowd SSO password securely
2022-07-22 13:12:17 +02:00
Maximilian Bosch 85231bbd6e
Merge pull request #182261 from mayflower/mailman-rest-api-pass-file
nixos/mailman: don't leak MAILMAN_REST_API_PASS into the store
2022-07-22 13:11:37 +02:00
Ilan Joselevich d0617a58e2
services/web-apps/lemmy.nix: Remove space that causes a type error 2022-07-22 01:19:28 -07:00
Florian Klink ad29dc19c1
Merge pull request #182436 from K900/systemd-initrd-fixes
nixos/systemd: make sure all the device nodes are created in stage1
2022-07-22 15:06:59 +07:00
Florian Klink 7c119675a3
Merge pull request #179002 from klemensn/move-passwdEntry-type
move passwdEntry type
2022-07-22 14:16:57 +07:00
K900 c9183d3738 nixos/systemd: make sure all the device nodes are created in stage1
The ConditionFileNotEmpty override patch wasn't correct for stage1, which
does have the modules in /lib. So, remove the patch and set
the right path with overrides in the final system.

Also, make sure systemd-tmpfiles-setup-dev is pulled in to create
all the necessary symlinks.
2022-07-22 10:01:21 +03:00
Netali 93132dc09c
nixos/pam: refactor pam_mount unmounting fix 2022-07-22 04:17:14 +02:00
Dan Callaghan b30534eb02 openldap: load client config from /etc, not the nix store
We want Openldap clients to load /etc/ldap.conf at runtime, not
${pkgs.openldap}/etc/ldap.conf which is always a sample config.

Pass sysconfdir=/etc at compile time, so that /etc/krb5.conf is embedded
in the library as the path of its config file.

Pass sysconfdir=${out}/etc at install time, so that the sample configs
and schema files are correctly included in the build output.

This hack works because the Makefiles are not smart enough to notice
that the sysconfdir variable has changed across invocations -- because
nobody ever writes their Makefiles to be that smart. :-)

Fixes #181937.
2022-07-22 03:19:46 +02:00
github-actions[bot] df9f22a8b8
Merge staging-next into staging 2022-07-22 00:03:25 +00:00
github-actions[bot] d44e369b44
Merge master into staging-next 2022-07-22 00:02:40 +00:00
Martin Weinelt fa8de76521
Revert "openldap: load client config from /etc, not the nix store" 2022-07-22 00:29:21 +02:00
Martin Weinelt b435482234
Merge pull request #182080 from danc86/openldap-sysconfdir 2022-07-22 00:28:49 +02:00
Martin Weinelt 457d109dcd
Merge pull request #179597 from Mic92/openldap-path
[staging] openldap: remove deprecated options, improve encapsulation
2022-07-22 00:26:32 +02:00
Sandro 98b4daa994
Merge pull request #181881 from SuperSandro2000/searx 2022-07-21 22:39:48 +02:00