Joachim F
c9200f8d9c
Merge pull request #28874 from ryantm/mattermost
...
nixos/mattermost: fix create role
2017-09-13 19:41:25 +00:00
Jörg Thalheim
13edd9765a
Merge pull request #29125 from geistesk/firehol-3.1.4
...
firehol: init at 3.1.4, iprange: init at 1.0.3
2017-09-13 18:10:22 +01:00
Vladimír Čunát
97ac29cafc
hpsa service: fallout from #28557 merge and revert
2017-09-13 07:55:48 +02:00
Pascal Bach
a217d73381
node-exporter service: fix documentation for enabledCollectors
2017-09-12 22:38:17 +02:00
Vladimír Čunát
422adc3063
Merge branch 'staging'
...
10k staging builds are not yet finished on Hydra (mostly darwin),
but we now have a 20k jobs rebuilding directly on master, so we would
never get to merge this way...
2017-09-12 19:17:52 +02:00
Jörg Thalheim
39e327eeb5
nixos/openafs-client: update cellServDB 2009-06-29 -> 2017-03-14
2017-09-12 13:12:41 +01:00
Bjørn Forsman
6b9ee30672
nixos/gitolite: don't leak nix store hash into gitolite-admin username/key
...
It doesn't look good when the initial admin user is named
"<hash>-gitolite-admin" and the key stored as
"<hash>-gitolite-admin.pub". Instead, make it simply "gitolite-admin"
and "gitolite-admin.pub".
2017-09-12 10:56:11 +02:00
Edward Tjörnhammar
847ce53ab1
nixos, i2pd: nat option, default true
2017-09-12 10:13:29 +02:00
Jörg Thalheim
26619935d1
Merge pull request #29083 from timor/physlock-11-dev
...
physlock: 0.5 -> 11-dev
2017-09-12 08:56:52 +01:00
Jörg Thalheim
ebc1127cb9
Merge pull request #29247 from pvgoran/gitolite-RequiresMountsFor
...
nixos/gitolite: add RequiresMountsFor unit option
2017-09-12 08:02:51 +01:00
Bjørn Forsman
fc02a0265a
nixos/samba: remove space in "[ global ]" heading
...
Use consistent no-space style. (All documentation I've seen use no
space, and the generated section headings from the NixOS module also use
no space.)
2017-09-12 08:03:14 +02:00
Frederik Rietdijk
628b6c0e9d
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-11 22:52:53 +02:00
pvgoran
4c4f73c0eb
services.gitolite: Add RequiresMountsFor unit option ...
...
... to ensure that the filesystem where `dataDir` resides is mounted when we do initialization or upgrade.
2017-09-12 02:03:51 +07:00
Pascal Bach
334e23d244
nixos/prometheus-collectd-exporter: init module ( #29212 )
...
* prometheus-collectd-exporter service: init module
Supports JSON and binary (optional) protocol
of collectd.
* nixos/prometheus-collectd-exporter: submodule is not needed for collectdBinary
2017-09-11 19:17:00 +01:00
lewo
3a377e26b2
nixos/nova-image: cleanup image builders ( #29242 )
...
There are currently two ways to build Openstack image. This just picks
best of both, to keep only one!
- Image is resizable
- Cloudinit is enable
- Password authentication is disable by default
- Use the same layer than other image builders (ec2, gce...)
2017-09-11 17:33:33 +01:00
Robert
1b1fc65505
NixOS Manual: document assertions and warnings ( #29206 )
...
* NixOS Manual: document assertions and warnings
* NixOS manual: re-wrap assertions text
2017-09-11 17:12:50 +01:00
Vladimír Čunát
d6f9c0b353
nixos tests: restrict sysctl and plasma5 to x86_64-linux
...
- sysctl is new and never succeeded on i686-linux
> cannot stat /proc/sys/net/core/bpf_jit_enable: No such file or directory
- testing plasma5 on i686 would defeat part of the reason why we ended
supporting i686 (lots of stuff built on Hydra)
2017-09-11 07:35:19 +02:00
timor
ae87a30a83
physlock: 0.5 -> 11-dev
...
Update physlock to a more current version which supports PAM and
systemd-logind. Amongst others, this should work now with the slim
login manager without any additional configuration, because it does
not rely on the utmp mechanism anymore.
2017-09-10 22:43:05 +02:00
Thomas Bach
4d101993bf
manual: reworked submodule section for better readability
...
The section was strange to read, as the initial example already used
`listOf' which is mentioned in the very first paragraph. Then you read
in a subsection about `listOf' and the exact same example is given
once again.
2017-09-10 20:51:50 +02:00
Thomas Bach
f37a1e155e
manual: fixed remaining placeholder literal
2017-09-10 20:51:50 +02:00
Thomas Bach
572726a570
manual: name' is not an argument for
mkOption'
2017-09-10 20:51:50 +02:00
Ryan Mulligan
9c786d82f2
matterbridge, modules/matterbridge: init at 1.1.0
2017-09-10 08:57:28 -07:00
Jörg Thalheim
7641d0e335
Merge pull request #29171 from vaibhavsagar/znc-open-firewall
...
znc: open firewall with configured port
2017-09-10 14:34:29 +01:00
Jörg Thalheim
9b8f67969e
Merge pull request #29191 from LumiGuide/fix-test-elk-i686
...
tests/elk: Fixed failing build on i686.
2017-09-10 11:53:34 +01:00
Falco Peijnenburg
11ccf69f75
tests/elk: Fixed failing build on i686.
...
Too much memory is required for the test.
2017-09-10 12:45:48 +02:00
Vaibhav Sagar
c7dd5e146b
znc: add openFirewall configuration option
2017-09-10 18:41:39 +08:00
Franz Pletz
0d206c0b6c
nixos/release: xmonad isn't release-critical
2017-09-10 11:01:26 +02:00
Frederik Rietdijk
dab3272f47
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-10 08:56:39 +02:00
Vaibhav Sagar
83d89e9b22
znc: open firewall with configured port
...
The configuration doesn't currently open the configured port, which is
less convenient than opening it.
2017-09-10 11:30:46 +08:00
Vaibhav Sagar
405050b2cb
znc: fix network example configuration
...
s/ssl/useSSL/
2017-09-10 11:25:29 +08:00
Ruben Maher
4ff9e9e333
nixos/transmission: make it possible to use a different home directory ( #29138 )
2017-09-09 20:19:35 +00:00
Joachim Fasting
8aa0618cf0
nixos/hardened: blacklist a few obscure net protocols
2017-09-09 17:37:17 +02:00
Joachim Fasting
2bce0b13e7
nixos/hardened: set mmap_min_addr
...
This is set in the hardened linux config as well but sysctl is more
flexible & works with any boot.kernelPackages
2017-09-09 17:37:15 +02:00
Tim Steinbach
84e34d4d5d
tests: xmonad less dependent on timings
2017-09-09 10:07:34 -04:00
Joachim F
b5163bc937
Merge pull request #29071 from nh2/glusterfs-glusterfind-dirs
...
glusterfs service: Ensure dirs needed by `glusterfind` exist
2017-09-09 13:07:39 +00:00
Pascal Bach
2ed89eddf3
squid service: intial service based on default config
2017-09-09 12:44:46 +02:00
geistesk
2316f16ac0
nixos/fireqos: add service
2017-09-09 00:29:46 +02:00
Frederik Rietdijk
febd5e323d
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-08 20:48:14 +02:00
Michael Alan Dorman
cd283e9234
mfi: Remove remaining reference to mfi.nix
...
This file was removed in 6f0b538044, but sufficient care was not taken
to remove all references to it. Without this change, trying to
rebuild nixos fails.
2017-09-08 14:33:45 +02:00
Tim Steinbach
539dcef15e
tests: Fix copperhead call
2017-09-07 19:43:51 -04:00
Vladimír Čunát
94036cabda
nixos/release*: fixup evaluation of the tested job
2017-09-07 21:52:28 +02:00
Bjørn Forsman
eed14baec3
nixos/postfix: undo deprecation of extraConfig, extraMasterConf
...
I realize that advanced users like to configure services with Nix
attrsets, but I don't think we should remove the option to use the
(configuration) language provided by upstream.
2017-09-07 21:41:29 +02:00
Jörg Thalheim
6f0b538044
nixos/mfi: remove
2017-09-07 10:24:03 +01:00
Niklas Hambüchen
5bc38fc089
glusterfs service: Ensure dirs needed by glusterfind
exist
2017-09-07 10:38:52 +02:00
Frederik Rietdijk
d38ee5b46c
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-07 09:29:44 +02:00
Tim Steinbach
9d89fe932c
tests: Fix hibernate
...
(cherry picked from commit 024b501907eafbd89624e465ff21afbc96e9fec6)
2017-09-06 22:02:34 -04:00
Tim Steinbach
024b501907
tests: Fix hibernate
2017-09-06 22:01:48 -04:00
Tim Steinbach
7faad2dce8
Merge pull request #29040 from NeQuissimus/tests_sys
...
More basic system tests
2017-09-06 15:04:10 -04:00
Tim Steinbach
a54b2e3ba2
Merge pull request #29002 from NeQuissimus/docker_edge_module_test
...
docker: Package in module, tests
2017-09-06 15:03:56 -04:00
Tim Steinbach
0857e4c84d
Merge pull request #28989 from NeQuissimus/tests_xmonad
...
Add XMonad test
2017-09-06 15:03:41 -04:00