Commit Graph

7541 Commits

Author SHA1 Message Date
Frederik Rietdijk
1b5c537f45 Merge staging-next into staging 2019-10-18 12:27:41 +02:00
WilliButz
917b127314
Merge pull request #71243 from d-goldin/prometheus_blackbox_configfile
prometheus-blackbox-exporter: coercing cfg to path
2019-10-18 08:11:03 +02:00
Dima
b788467ec4 prometheus-blackbox-exporter: fixing path issue
This fixes an issue with a recent addition of a config file
check in c28ded36ef.

Previously it was possible to supply a path as a string
to `configFile`. Now it will fail checking the config file
during evaluation of the module due to sandboxing.

A toggle to disable the check, more informative log messages
and handling for various configFile values are added.
2019-10-18 02:03:02 +02:00
Frederik Rietdijk
0256080d11 nixos/pppd: add description for peers, unbreaks metrics job and channel
services.pppd.peers was lacking a description, causing a trace warning
resulting in a parse error in the metrics job.
2019-10-17 13:59:52 +02:00
Florian Klink
36756e930f udisks2: use tmpfiles instead of activation script to create /var/lib/udisks2 2019-10-16 20:31:33 -04:00
worldofpeace
2fbccbc728 Revert "Merge pull request #71095 from flokli/pinentry-cleanup"
This reverts commit 823da4d492, reversing
changes made to b75c8ee3bc.
2019-10-16 20:28:21 -04:00
worldofpeace
823da4d492
Merge pull request #71095 from flokli/pinentry-cleanup
Split pinentry flavors and enable udisks2 on install media again
2019-10-17 00:24:15 +00:00
Florian Klink
e397b949a9 udisks2: use tmpfiles instead of activation script to create /var/lib/udisks2 2019-10-16 19:56:50 -04:00
Florian Klink
fff04a0a49
nixos/pppd: init (#71105)
nixos/pppd: init
2019-10-17 01:15:55 +02:00
David Anderson
997a6f6f1e nixos/pppd: init 2019-10-15 08:36:09 -07:00
Maximilian Bosch
7774945b70
Merge pull request #70469 from Vskilet/matrix-synapse-update
matrix-synapse: 1.3.1 -> 1.4.0
2019-10-15 01:31:21 +02:00
Victor SENE
372422390f
matrix-synapse: 1.3.1 -> 1.4.0
Bumps `matrix-synapse` to version 1.4.0[1]. With this version the
following changes in the matrix-synapse module were needed:

* Removed `trusted_third_party_id_servers`: option is marked as deprecated
  and ignored by matrix-synapse[2].
* Added `account_threepid_delegates` options as replacement for 3rdparty
  server features[3].
* Added `redaction_retention_period` option to configure how long
  redacted options should be kept in the database.
* Added `ma27` as maintainer for `matrix-synapse`.

Co-Authored-By: Notkea <pacien@users.noreply.github.com>
Co-authored-by: Maximilian Bosch <maximilian@mbosch.me>

[1] https://matrix.org/blog/2019/10/03/synapse-1-4-0-released
[2] https://github.com/matrix-org/synapse/pull/5875
[3] https://github.com/matrix-org/synapse/pull/5876
2019-10-15 01:11:18 +02:00
WilliButz
104b93eef0
Merge pull request #70070 from Ma27/borgbackup-removable-devices
nixos/borgbackup: add option to allow removable devices
2019-10-14 18:02:30 +02:00
Maximilian Bosch
2dfc67517a
nixos/borgbackup: add option to allow removable devices
When having backup jobs that persist to a removable device like an
external HDD, the directory shouldn't be created by an activation script
as this might confuse auto-mounting tools such as udiskie(8).

In this case the job will simply fail, with the former approach
udiskie ran into some issues as the path `/run/media/ma27/backup` was
already there and owned by root.
2019-10-14 17:28:44 +02:00
Florian Klink
5d5b79d517
nixos/mysql: fix mysqlReplication test (#61671)
nixos/mysql: fix mysqlReplication test
2019-10-13 23:05:23 +02:00
worldofpeace
6d5fe6b8ed
Merge pull request #71065 from worldofpeace/gdm-no-plymouth-conflict
nixos/gdm: don't conflict with plymouth-quit
2019-10-13 17:34:00 +00:00
worldofpeace
ed20a541c5 nixos/gdm: don't conflict with plymouth-quit
Co-Authored-By: Tor Hedin Brønner <torhedinbronner@gmail.com>
2019-10-13 13:30:43 -04:00
Izorkin
632f69e485 nixos/mysql: fix mysqlReplication test 2019-10-13 19:18:51 +03:00
Vladimír Čunát
4e6826a3b2
Merge branch 'staging-next'
It's not perfect, but I think we can deal with the rest of the
regressions directly on master, so that this process does not stall.
2019-10-13 16:10:58 +02:00
Maximilian Bosch
87178a2e6e
Merge pull request #71058 from WilliButz/add-nextcloud-exporter
prometheus-nextcloud-exporter: init at 2019-10-12, with module and test
2019-10-13 13:47:41 +02:00
Vladimír Čunát
b5697c6954
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1548439
2019-10-13 13:31:33 +02:00
Maximilian Bosch
eeb4726446
nixos/prometheus-wireguard-exporter: remove addr option
This option was added by mistake since `listenAddress` exists by default
for each prometheus-exporter. Using
`services.prometheus.exporters.wireguard.addr` will now cause a warning,
but doesn't break eval.
2019-10-13 12:16:46 +02:00
Tor Hedin Brønner
d15e5b02fe
nixos/lightdm: do not conflict with plymouth (#71061)
Having `display-manager` conflict with `plymouth-quit` causes this lock up:

 - `plymouth-quit-wait` starts up, waiting for plymouth-quit to run
 - `lightdm` starts up
 - `plymouth-quit` can't start, it conflicts with lightdm
 - `plymouth-quit-wait` keeps waiting on plymouth-quit to kill plymouthd

The idea is having LightDM control when plymouth quits, but communication with
plymouth was broken: https://github.com/NixOS/nixpkgs/pull/71064

Unfortunately having the conflict breaks switching to configurations with
plymouth enabled. So we still need to remove the conflict.

fixes #71034
2019-10-13 10:03:54 +02:00
WilliButz
d953d328ca
nixos/prometheus-nextcloud-exporter: add module 2019-10-12 23:17:48 +02:00
Joachim F
a8b2e302c6
Merge pull request #41841 from Izorkin/samba
samba: fix autostart service
2019-10-12 14:31:39 +00:00
Mario Rodas
af4351ab85
Merge pull request #69255 from minijackson/init-shiori
Init shiori
2019-10-12 09:01:58 -05:00
Jan Tojnar
6c8aed6391
Merge branch 'master' into staging-next 2019-10-12 00:50:21 +02:00
Tor Hedin Brønner
5b7c900192
nixos/gdm: do not restart on reload switch (#70357)
Not entirely sure how this works, but this does seem to fix reload switch
killing the current graphical session.
2019-10-11 20:07:16 +02:00
Florian Klink
1aad3acf15
nixos/gitlab: Don't print sensitive data to log on startup (#70861)
nixos/gitlab: Don't print sensitive data to log on startup
2019-10-11 18:10:16 +02:00
Aaron Andersen
0b6067f93e
Merge pull request #68836 from Thra11/wacomtablet-kcm
wacomtablet: init at 3.2.0
2019-10-11 05:52:37 -04:00
Eelco Dolstra
9d0de0dc57
nix-daemon.nix: Shut up warning 2019-10-10 16:24:33 +02:00
Eelco Dolstra
27d2857a99
nix-daemon.nix: Use 'nix ping-store' to initialize directories 2019-10-10 16:24:33 +02:00
Eelco Dolstra
4b950c42cd
nix-daemon.nix: Drop Nix 1.x compatibility
Probably didn't work anyway anymore.
2019-10-10 16:24:33 +02:00
Eelco Dolstra
4e0d6a5ff8
Don't create /nix/var/nix/{gcroots,per-user}/per-user with 1777 permission
In fact, don't create them at all because Nix does that automatically.

Also remove modules/programs/shell.nix because everything it did is
now done automatically by Nix.
2019-10-10 16:24:33 +02:00
worldofpeace
1169336cd9
Merge pull request #70448 from worldofpeace/lightdm-improve-systemd
nixos/lightdm: improve systemd service
2019-10-09 21:22:19 +00:00
Robin Gloster
8e1fdad7c6
Merge pull request #70858 from manveru/nginx-map-hash-sizes
nginx: add map_hash_*_size options
2019-10-09 17:32:40 +02:00
Christoph Hrdinka
65be608330
Merge pull request #70371 from dminuoso/dovecot-fix-type
dovecot: fix wrong type in configFile option
2019-10-09 17:25:12 +02:00
talyz
dc29a45fc9 nixos/gitlab: Don't print sensitive data to log on startup
gitlab:db:configure prints the root user's password to stdout on
successful setup, which means it will be logged to the
journal. Silence this informational output. Errors are printed to
stderr and will thus still be let through.
2019-10-09 16:59:18 +02:00
Franz Pletz
f024e7b769
Merge pull request #67890 from mguentner/mxisd_ma1sd
mxisd: 1.4.5 -> 1.4.6 ☺ ma1sd: init at 2.1.1
2019-10-09 14:36:56 +00:00
Milan Pässler
ff0148d868 nixos/nginx: use mailcap mime.types
The mime type definitions included with nginx are very incomplete, so
we use a list of mime types from the mailcap package, which is also
used by most other Linux distributions by default.
2019-10-09 14:20:40 +00:00
Michael Fellinger
2d0b34aa1c
nginx: add map_hash_*_size options 2019-10-09 15:59:03 +02:00
José Romildo Malaquias
f251c29484
Merge pull request #70035 from mkf/cwm-windowManager
nixos/cwm: init. Added windowManager cwm, basing on the module for dwm.
2019-10-09 07:04:39 -03:00
Robin Gloster
b5449e65b5
Merge pull request #69344 from talyz/gitlab-create-database
nixos/gitlab: Fix databaseCreateLocally evaluation and operation
2019-10-09 00:28:21 +02:00
Robin Gloster
b648a710af
Merge pull request #68721 from talyz/gitlab-fix
nixos/gitlab: Fix state directory permissions, clean up initializers directory
2019-10-09 00:27:12 +02:00
Michał Krzysztof Feiler
00633a3e13
nixos/window-managers: add cwm to imports
as per request from @romildo under #70035 https://github.com/NixOS/nixpkgs/pull/70035#pullrequestreview-298166798
2019-10-08 17:48:09 +00:00
Frederik Rietdijk
a0c34f54cc Merge master into staging-next 2019-10-08 11:56:52 +02:00
Maximilian Güntner
176b1aeb4e
nixos/mxisd: add support for ma1sd
both servers only differ slighly so the module
can be reused
2019-10-07 18:57:15 +02:00
Symphorien Gibol
d9cac95878 nixos/xfce4-14: add xfce4-volumed-pulse when not using the desktop
xfce4-volumed-pulse is not abandoned, but is superseded by a panel
plugin which is not available when not using the desktop.

Fixes: volume up/down keys support
2019-10-06 21:22:44 +02:00
worldofpeace
67ac11e072 nixos/lightdm: improve systemd service
These improvements come from shopping around
at what other downstreams have done with their
systemd units and recent changes like [0] to gdm.

Note there's no requries or after on dbus.socket because
settings BusName will set this up automaticallly and
give it a type of dbus.

[0]: 2d57f45962
2019-10-06 10:23:21 -04:00
Maximilian Bosch
d72f4e2ae0
Merge pull request #70422 from elseym/documize-writable-home
documize: introduce state directory
2019-10-05 13:20:58 +02:00