swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity
176356 commits 5 branches 0 tags 27 GiB
Commit graph

12698 commits

Author SHA1 Message Date
Bas van Dijk 285fd3c05a nixos/prometheus: abstract over optional option creation 2019-04-18 11:55:43 +02:00
Bas van Dijk 55ef5d4246 nixos/prometheus: set optional attributes to type types.nullOr 
This makes sure that when a user hasn't set a Prometheus option it
won't show up in the prometheus.yml configuration file. This results
in smaller and easier to understand configuration files.
 2019-04-17 14:49:09 +02:00
Bas van Dijk 57e5b75f9c nixos/prometheus: filter out the _module attr in a central place 
We previously filtered out the `_module` attribute in a NixOS
configuration by filtering it using the option's `apply` function.

This meant that every option that had a submodule type needed to have
this apply function. Adding this function is easy to forget thus this
mechanism is error prone.

We now recursively filter out the `_module` attributes at the place we
construct the Prometheus configuration file. Since we now do the filtering
centrally we don't have to do it per option making it less prone to errors.
 2019-04-17 14:08:16 +02:00
Joachim F d7da5e2af2
Merge pull request #53826 from delroth/randstruct-custom-seed 
nixos: allow customizing the kernel RANDSTRUCT seed
 2019-04-16 17:49:19 +00:00
Bas van Dijk a913d0891c nixos/prometheus: filter out empty srcape_configs attributes 
This results in a smaller prometheus.yml config file.

It also allows us to use the same options for both prometheus-1 and
prometheus-2 since the new options for prometheus-2 default to null
and will be filtered out if they are not set.
 2019-04-16 16:06:11 +02:00
Bas van Dijk a23db5db08 nixos/prometheus: add new ec2_sd_config options for prometheus2 2019-04-16 16:04:33 +02:00
Andrew Childs ad7e232f88 nixos/prometheus: add ec2_sd_configs section to scrape_configs 2019-04-16 13:43:52 +02:00
Bas van Dijk e7fadde7a7 nixos/doc: remove prometheus2 notes from the 19.09 release notes 
prometheus2 has been backported to 19.03 so it won't be new for 19.09.
 2019-04-16 09:47:45 +02:00
Bas van Dijk d1940beb3a nixos/prometheus/pushgateway: add module and test 2019-04-16 08:09:38 +02:00
worldofpeace 27ac8cb2c4
Merge pull request #59185 from worldofpeace/glib-networking 
nixos/glib-networking: init
 2019-04-15 13:17:58 -04:00
worldofpeace 7802b18958 nixos/pantheon: use glib-networking module 2019-04-15 13:11:58 -04:00
Eelco Dolstra 5399f34ad9
nix: 2.2 -> 2.2.2 2019-04-15 19:06:57 +02:00
worldofpeace b0e9f85f47 nixos/glib-networking: init 
Note that we were previously didn't have glib-networking
in systemd.packages so the PacRunner was non-functional.
 2019-04-15 13:04:06 -04:00
adisbladis 9a176d669a
nixos/tox-node: Add descriptions to module options. 
Missing these broke the tarball build
https://hydra.nixos.org/build/92258938/nixlog/1
 2019-04-15 17:11:10 +01:00
José Romildo Malaquias c32b50a5f7
Merge pull request #59520 from romildo/upd.deepin.deepin-daemon 
nixos/dde-daemon: init
 2019-04-15 10:30:51 -03:00
adisbladis 4b4caa9413
Merge pull request #59368 from suhr/tox-node 
nixos/tox-node: init
 2019-04-15 12:28:27 +03:00
adisbladis 454aa43213
nixos/tox-node: Dont hardcode bootstrap nodes 
Get these from upstream tox-node package instead.
This is likely to cause less maintenance overhead over time and
following upstream bootstrap node changes is automated.
 2019-04-15 09:27:32 +01:00
Сухарик 6cb40f7b0b
nixos/tox-node: init 2019-04-15 09:27:27 +01:00
Bas van Dijk e5724e8e66
Merge pull request #59514 from basvandijk/elk-7.0.0 
elk7: init at 7.0.0
 2019-04-15 07:05:13 +02:00
José Romildo Malaquias 46a4e92d92 nixos/deepin-daemon: init 2019-04-14 21:47:45 -03:00
Bas van Dijk 13352f28d2 elk7: init at 7.0.0 
This adds the following new packages:

+ elasticsearch7
+ elasticsearch7-oss
+ logstash7
+ logstash7-oss
+ kibana7
+ kibana7-oss
+ filebeat7
+ heartbeat7
+ metricbeat7
+ packetbeat7
+ journalbeat7

The default major version of the ELK stack stays at 6. We should
probably set it to 7 in a next commit.
 2019-04-14 21:39:46 +02:00
Silvan Mosberger a63c182d53
Merge pull request #59315 from Infinisil/znc-docs-url 
nixos/znc: Fix URL XML for config option
 2019-04-14 17:33:49 +02:00
worldofpeace 4616b4ec85
Merge pull request #21860 from e-user/bugfix/upstream/gnome-pam 
nixos/gdm: use provided PAM login configuration wherever possible
 2019-04-14 09:52:17 -04:00
Alexander Kahl 56bd0110e7 nixos/pam: Add GNOME keyring use_authtok directive to password group 2019-04-14 09:50:22 -04:00
Alexander Kahl 5b9895b1a0 nixos/gdm: use provided PAM login configuration wherever possible 
Fixes #21859
 2019-04-14 09:49:01 -04:00
worldofpeace c9a925d82b
Merge pull request #59433 from romildo/upd.deepin.deepin-menu 
nixos/deepin-menu: init
 2019-04-14 09:18:15 -04:00
José Romildo Malaquias 9e99eed443 nixos/deepin-menu: init 2019-04-14 10:00:44 -03:00
Linus Heckemann 0fc80a576a
Merge pull request #59423 from lheckemann/initramfs-improvements 
Initramfs improvements
 2019-04-14 12:10:26 +02:00
Sarah Brofeldt f839011719
Merge pull request #58512 from aanderse/solr 
solr: init at 8.0.0
 2019-04-14 11:16:28 +02:00
Danylo Hlynskyi eddb31be99
Merge pull request #55121 from Ma27/add-option-support-to-nixos-build-vms 
nixos-build-vms: pass `--option` to `nix-build`
 2019-04-14 02:57:57 +03:00
Linus Heckemann b499c52de5 stage-1: provide meaningful names to initrd and module tree 2019-04-13 23:22:56 +02:00
markuskowa 7d363d46ba
Merge pull request #59362 from matthiasbeyer/ympd-port-int 
ympd service: Allow webPort to be int
 2019-04-12 20:59:13 +02:00
Graham Christensen 628ba24e77
Merge pull request #59349 from mogorman/manual-upgrading 
nixos/manual: update 17.03 -> 19.03 in upgrading section
 2019-04-12 12:19:12 -04:00
Matthias Beyer 31884f788e ympd service: Allow webPort to be int 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
 2019-04-12 18:17:10 +02:00
Matthew O'Gorman da035d3ad6
nixos/manual: update 17.03 -> 19.03 in upgrading section 2019-04-12 12:16:30 -04:00
Silvan Mosberger 92ae299998
Merge pull request #59081 from Yarny0/hylafax-updates 
HylaFAX: fix ModemGroup, also minor metadata updates
 2019-04-12 16:30:46 +02:00
Bas van Dijk 08b277e0da
Merge pull request #56017 from elohmeier/prom-tls 
prometheus: add tls_config
 2019-04-12 12:57:54 +02:00
Joachim F 5dafbb2cb1
Merge pull request #56719 from bricewge/miniflux-service 
miniflux: add service
 2019-04-12 09:57:30 +00:00
Yarny0 e57156bcaa nixos/hylafax: fix faxq ModemGroup setting 
The manpage claims that the "limit" in the setting::
  <name>:[<limit>:]<regex>
is optional and defaults to zero, implying no limit.
However, tests confirmed that it actually isn't optional.

Without limit, the setting ``any:.*`` places
outbound jobs on infinite hold if no particular
modem was specified on the sendfax command line.
The new default value ``any:0:.*`` from
this commit uses any available modem to
send jobs if not modem was given to sendfax.
 2019-04-12 11:11:49 +02:00
Yarny0 1438f7b664 nixos/hylafax: add 'yarny' (= myself) as maintainer 
I forgot to do this when I submitted this module with
commit 12fa95f2d6.
 2019-04-12 11:11:48 +02:00
Silvan Mosberger 2d1fa68c83
Merge pull request #59044 from teto/strongswan_path 
strongswan module: use strings for secrets.
 2019-04-11 22:51:24 +02:00
Enno Lohmeier da7aeb1b7d prometheus: add tls_config 2019-04-11 20:34:31 +02:00
Silvan Mosberger b8dc0f9a5b
nixos/znc: Fix URL XML for config option 2019-04-11 16:59:19 +02:00
Frederik Rietdijk 230c67f43b Merge master into staging-next 2019-04-11 07:50:23 +02:00
Ryan Mulligan 0960fc72b7
Merge pull request #49868 from jfrankenau/fix-triggerhappy 
nixos/triggerhappy: add option user
 2019-04-10 20:56:19 -07:00
Matthieu Coudron 08b8c6caf2 nixos/strongswan: use strings for secrets. 
The nixos module artifically enforces type.path whereas the ipsec secret configuration files
accept pattern or relative paths.
Enforcing absolute paths already caused problems with l2tp vpn:
https://github.com/nm-l2tp/NetworkManager-l2tp/issues/108
 2019-04-11 11:44:49 +09:00
Aaron Andersen ee7565af9d solr: init at 8.0.0 2019-04-10 20:12:41 -04:00
Bas van Dijk 38ae3fe584
Merge pull request #59270 from basvandijk/alertmanager-DynamicUser 
nixos/prometheus/alertmanager: use DynamicUser instead of nobody
 2019-04-10 22:56:17 +02:00
Bas van Dijk cd4486ecc3 nixos/prometheus/alertmanager: use DynamicUser instead of nobody 
See issue #55370
 2019-04-10 20:38:40 +02:00
Jörg Thalheim 4d4f110ca5
Merge pull request #59181 from Izorkin/nginx-format 
nixos/nginx: fix error in writeNginxConfig
 2019-04-10 19:23:34 +01:00