github-actions[bot]
901fb5e64e
Merge master into staging-next
2021-05-22 00:56:03 +00:00
Martin Weinelt
71fb79ee6b
Merge pull request #123828 from Lassulus/solanum2
...
nixos/solanum: init
2021-05-21 23:23:01 +02:00
Maximilian Bosch
a2379c69a4
Merge pull request #122833 from helsinki-systems/feat/prometheus-metric-relabel
...
nixos/prometheus: Add support for metric relabeling
2021-05-21 23:13:41 +02:00
lassulus
48c16e48aa
nixos/solanum: init
2021-05-21 23:06:38 +02:00
Maximilian Bosch
5dbd28d754
Merge pull request #123009 from deviant/fix-mailman-doc-links
...
nixos/mailman: fix documentation option links
2021-05-21 22:00:47 +02:00
Jonathan Ringer
5cd5b9b97f
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/tools/kubie/default.nix
2021-05-21 10:39:34 -07:00
eyJhb
6000f420e8
nixos/znc: fixed chown not working after hardening ( #123883 )
2021-05-21 19:07:53 +02:00
Elis Hirwing
e9cca93bf9
Merge pull request #121778 from talyz/keycloak-security
...
nixos/keycloak: Security fixes + misc
2021-05-21 16:55:26 +02:00
Kerstin Humm
224df6940f
nixos/mastodon: use rails command instead of rake
...
Co-Authored-By: Izorkin <izorkin@elven.pw>
2021-05-21 15:04:12 +02:00
github-actions[bot]
929b12e7b5
Merge master into staging-next
2021-05-21 12:28:43 +00:00
ajs124
c455f3ccaf
Merge pull request #123084 from Yarny0/hylafax
...
hylafaxplus & nixos/hylafax: small improvements
2021-05-21 14:20:57 +02:00
talyz
ba00b0946e
nixos/keycloak: Split certificatePrivateKeyBundle into two options
...
Instead of requiring the user to bundle the certificate and private
key into a single file, provide separate options for them. This is
more in line with most other modules.
2021-05-21 13:09:38 +02:00
talyz
dbf91bc2f1
nixos/keycloak: keycloak.database* -> keycloak.database.*
...
Move all database options to their own group / attribute. This makes
the configuration clearer and brings it in line with most other modern
modules.
2021-05-21 13:09:32 +02:00
talyz
83e406e97a
nixos/keycloak: frontendUrl always needs to be suffixed with /
...
In some places, Keycloak expects the frontendUrl to end with `/`, so
let's make sure it always does.
2021-05-21 13:09:25 +02:00
talyz
58614f8416
nixos/keycloak: Add myself to maintainers
2021-05-21 13:09:19 +02:00
talyz
d748c86389
nixos/keycloak: Improve readablility by putting executables in PATH
2021-05-21 13:09:14 +02:00
talyz
8309368e4c
nixos/keycloak: Set umask before copying sensitive files
...
`install` copies the files before setting their mode, so there could
be a breif window where the secrets are readable by other users
without a strict umask.
2021-05-21 13:09:09 +02:00
talyz
c2bebf4ee2
nixos/keycloak: Improve bash error handling
2021-05-21 13:09:03 +02:00
talyz
d6727d28e1
nixos/keycloak: Set the postgresql database password securely
...
Feeding `psql` the password on the command line leaks it through the
`psql` process' `/proc/<pid>/cmdline` file. Using `echo` to put the
command in a file and then feeding `psql` the file should work around
this, since `echo` is a bash builtin and thus shouldn't spawn a new
process.
2021-05-21 13:08:53 +02:00
Jonathan Ringer
6b15fdce86
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/shells/ion/default.nix
pkgs/tools/misc/cicero-tui/default.nix
2021-05-20 22:11:42 -07:00
legendofmiracles
af0a54285e
nixos/terraria: open ports in the firewall
2021-05-20 12:11:08 -07:00
Guillaume Girol
0d5fa1cff3
Merge pull request #120622 from symphorien/duplicity-master
...
nixos/duplicity: enable to prevent backup from growing infinitely
2021-05-20 19:00:59 +00:00
Jonas Chevalier
30c021fa15
Merge pull request #123744 from hercules-ci/init-ghostunnel
...
ghostunnel: init
2021-05-20 20:58:41 +02:00
Jonathan Ringer
14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/terminal-emulators/alacritty/default.nix
pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
Emery Hemingway
520b4a8496
nixos: convert netatalk to settings-style configuration
...
Also, set StateDirectory in systemd.….serviceConfig.
2021-05-20 17:39:28 +02:00
Robert Hensing
dc9cb63de4
nixos/ghostunnel: init
2021-05-20 10:41:52 +02:00
Christoph Hrdinka
57acb6f9f7
Merge pull request #123598 from pschyska/master
...
nixos/nsd: make nsd-checkconf work when configuration contains keys (#118140 )
2021-05-20 10:41:30 +02:00
Maximilian Bosch
3f3cec6d9e
clickhouse: 20.11.4.13-stable -> 21.3.11.5-lts
...
Failing Hydra build: https://hydra.nixos.org/build/143269865
ZHF #122042
2021-05-19 14:08:46 -07:00
Gabriel Gonzalez
8e9d803bac
Fix description for services.kubernetes.addonManager.enable ( #71448 )
...
`mkEnableOption` already prefixes the description with
"Whether to enable"
2021-05-19 13:49:27 -07:00
Jonathan Ringer
c1f8a15dac
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
nixos/doc/manual/release-notes/rl-2105.xml
pkgs/tools/security/sequoia/default.nix
2021-05-19 10:39:54 -07:00
Paul Schyska
69202853ea
nixos/nsd: make nsd-checkconf work when configuration contains keys
2021-05-19 18:21:10 +02:00
Martin Weinelt
446c97f96f
Merge pull request #123355 from Ma27/bump-matrix-synapse
2021-05-19 18:12:14 +02:00
Jan Tojnar
a858f1a90d
Merge pull request #123507 from jtojnar/no-flatpak-guipkgs
...
nixos/flatpak: Remove `guiPackages` internal option
2021-05-19 16:33:56 +02:00
Guillaume Girol
41c7fa448f
nixos/duplicity: add options to exercise all possible verbs
...
except restore ;)
2021-05-19 12:00:00 +00:00
Michele Guerini Rocco
376eabdac3
Merge pull request #123254 from rnhmjoj/ipsec
...
libreswan: 3.2 -> 4.4
2021-05-19 13:36:04 +02:00
talyz
380b52c737
nixos/keycloak: Use replace-secret to avoid leaking secrets
...
Using `replace-literal` to insert secrets leaks the secrets through
the `replace-literal` process' `/proc/<pid>/cmdline`
file. `replace-secret` solves this by reading the secret straight from
the file instead, which also simplifies the code a bit.
2021-05-19 09:32:28 +02:00
talyz
88b76d5ef9
nixos/mpd: Use replace-secret to avoid leaking secrets
...
Using `replace-literal` to insert secrets leaks the secrets through
the `replace-literal` process' `/proc/<pid>/cmdline`
file. `replace-secret` solves this by reading the secret straight from
the file instead.
2021-05-19 09:32:22 +02:00
talyz
3a29b7bf5b
nixos/mpdscribble: Use replace-secret to avoid leaking secrets
...
Using `replace-literal` to insert secrets leaks the secrets through
the `replace-literal` process' `/proc/<pid>/cmdline`
file. `replace-secret` solves this by reading the secret straight from
the file instead, which also simplifies the code a bit.
2021-05-19 09:32:17 +02:00
talyz
7842e89bfc
nixos/gitlab: Use replace-secret to avoid leaking secrets
...
Using `replace-literal` to insert secrets leaks the secrets through
the `replace-literal` process' `/proc/<pid>/cmdline`
file. `replace-secret` solves this by reading the secret straight from
the file instead, which also simplifies the code a bit.
2021-05-19 09:32:12 +02:00
talyz
38398fade1
nixos/discourse: Use replace-secret to avoid leaking secrets
...
Using `replace-literal` to insert secrets leaks the secrets through
the `replace-literal` process' `/proc/<pid>/cmdline`
file. `replace-secret` solves this by reading the secret straight from
the file instead, which also simplifies the code a bit.
2021-05-19 09:32:06 +02:00
Aaron Andersen
58ddbfa71d
Merge pull request #118395 from jwygoda/grafana-google-oauth2
...
grafana: add google oauth2 config
2021-05-18 23:11:24 -04:00
github-actions[bot]
7000ae2b9a
Merge master into staging-next
2021-05-19 00:55:36 +00:00
Martin Weinelt
a8f71f069f
Merge pull request #123006 from mweinelt/postgresqlbackup-startat
...
nixos/postgresqlBackup: allow defining multiple times to start at
2021-05-19 01:54:38 +02:00
Martin Weinelt
4c798857e2
Merge pull request #100274 from hax404/prometheus-xmpp-alerts
2021-05-19 01:36:28 +02:00
Georg Haas
03c092579a
prometheus-xmpp-alerts: apply RFC 42
2021-05-19 01:08:38 +02:00
Jonathan Ringer
ca46ad3762
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/tools/package-management/cargo-release/default.nix
2021-05-18 11:03:38 -07:00
Pamplemousse
037e51702e
nixos/services/foldingathome: Add an option to set the "nice level" ( #122864 )
...
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
2021-05-18 18:44:52 +02:00
Maciej Krüger
7458dcd956
Merge pull request #75242 from mkg20001/cjdns-fix
...
services.cjdns: add missing, optional login & peerName attribute
2021-05-18 18:22:29 +02:00
Jonathan Ringer
f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/graphics/emulsion/default.nix
pkgs/development/tools/misc/texlab/default.nix
pkgs/development/tools/rust/bindgen/default.nix
pkgs/development/tools/rust/cargo-udeps/default.nix
pkgs/misc/emulators/ruffle/default.nix
pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
Robert Schütz
d189df235a
Merge pull request #122241 from dotlambda/znc-harden
...
nixos/znc: harden systemd unit
2021-05-18 17:44:14 +02:00