lethalman
d791335ac2
Merge pull request #6518 from ehmry/u9fs
...
U9fs
2015-02-26 09:41:18 +01:00
William A. Kennington III
9ce0c1cb71
nixos/consul: Fix timeout bugs and json formatting
2015-02-25 15:42:43 -08:00
William A. Kennington III
f27fa79aa9
nixos/dnsmasq: Fix service name typo
2015-02-25 09:22:16 -08:00
Eelco Dolstra
36d0f367de
ssh-agent: Fix asking for confirmation via $SSH_ASKPASS
...
This was lost back in
ffedee6ed5
. Getting this to work is
slightly tricky because ssh-agent runs as a user unit, and so doesn't
know the user's $DISPLAY.
2015-02-25 14:31:17 +01:00
Eelco Dolstra
93902ea108
nsswitch.conf: Omit ldap unless ldap is enabled
...
This prevents programs from trying to find nss_ldap.
2015-02-25 14:31:13 +01:00
William A. Kennington III
e453f99446
nixos/networkd: Add an assertion for unsupported rstp
2015-02-24 13:09:34 -08:00
lethalman
2fdad12a8d
Merge pull request #6552 from nslqqq/master
...
Correct NetworkManager documentation
2015-02-24 18:32:24 +01:00
Nikita Mikhailov
25e29b3870
Correct NetworkManager documentation
2015-02-24 22:09:36 +05:00
Lluís Batlle i Rossell
b26e939111
fix pam (OATH related)
...
the pam config was wrong.
Issue #6551
2015-02-24 17:52:41 +01:00
Eelco Dolstra
16cf3ee9da
Ensure that the home directory exists even if the user already exists
2015-02-24 11:57:38 +01:00
Jaka Hudoklin
1cddb5be20
mongodb: remove lock file on restart
2015-02-23 20:40:13 +01:00
Eelco Dolstra
b70bd0879b
sshd: Generate a ed25519 host key
2015-02-23 17:00:07 +01:00
Emery Hemingway
446580f3cd
nixos: u9fs service module
2015-02-22 12:16:58 -05:00
Bjørn Forsman
d5017499a2
nixos/redis: capitalize service description
2015-02-22 16:54:14 +01:00
Bjørn Forsman
25a6745310
nixos/fail2ban: capitalize service description
2015-02-22 16:54:14 +01:00
Lluís Batlle i Rossell
4e99901961
nixos: Adding OATH in pam.
...
(cherry picked from commit cb3cba54a1b87c376d0801238cb827eadb18e39e)
Conflicts:
nixos/modules/security/pam.nix
2015-02-22 15:25:38 +01:00
Bjørn Forsman
419a4166a7
nixos/haproxy: small cleanup
...
* Add option types
* Rewrite option descriptions
* /var/run/haproxy.pid => /run/haproxy.pid (canonical location)
2015-02-22 12:29:34 +01:00
aszlig
030895f075
nixos/dhcpcd: Only run resume commands if enabled.
...
The networkd implementation sets systemd.services.dhcpcd.enable to
false in nixos/modules/tasks/network-interfaces-systemd.nix. So we need
to respect that in the dhcpcd module.
If we don't, the resumeCommand is set nevertheless, which causes the
post-resume.service to fail after resuming:
Failed to reload dhcpcd.service: Unit dhcpcd.service is masked.
post-resume.service: main process exited, code=exited, status=1/FAILURE
Failed to start Post-Resume Actions.
Dependency failed for Post-Resume Actions.
Unit post-resume.service entered failed state.
post-resume.service failed.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-02-22 08:09:04 +01:00
aszlig
9de4caddc1
nixos/tests/chromium: Check new userns sandbox.
...
Since Chromium version 42, we have a new user namespaces sandbox in the
upstream project. It's more integrated so the chrome://sandbox page
reports it as "Namespace Sandbox" instead of SUID sandbox, which we were
re-using (or abusing?) in our patch.
So if either "SUID Sandbox" or "Namespace Sandbox" reports with "Yes",
it's fine on our side.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-02-22 07:52:53 +01:00
Thomas Tuegel
d15d0bebc3
kde5: remove file collisions
2015-02-21 20:58:43 -06:00
Thomas Tuegel
68f2db74ff
kde5: always use plasma-nm
2015-02-21 13:59:28 -06:00
Thomas Tuegel
7eb8a9b41f
kde5: install media-player-info udev rules for solid
2015-02-21 11:39:21 -06:00
Thomas Tuegel
532650e4bb
kde5: change notice about default Phonon backend
2015-02-21 11:39:21 -06:00
Thomas Tuegel
e5de75bf2a
kde5: install kde-frameworks version used by plasma
2015-02-21 11:39:21 -06:00
Thomas Tuegel
b050babd3e
kde5: fix Phonon GStreamer backend
2015-02-21 11:39:20 -06:00
Thomas Tuegel
a79936561b
environment: use Qt 5 Qml import paths
2015-02-21 11:39:20 -06:00
Vladimír Čunát
a3a467ce77
nixos/nvidia: use correct 32-bit legacy libs; refactor
...
Fixes #6127 .
Now we avoid multiple switches among the version possibilities.
2015-02-21 16:34:24 +01:00
Bjørn Forsman
97875ac175
bridge-utils: align attrname with pkgname
2015-02-20 22:30:51 +01:00
Thomas Strobel
c62e42e9c5
Enhance stage-1/2 scripts for better dealing with squashfs
2015-02-20 17:42:22 +01:00
Peter Simons
263a49be20
Merge pull request #5704 from eduarrrd/nixos-version
...
Add option to display git revision to nixos-version
2015-02-20 16:35:56 +01:00
Shea Levy
2fe3a3c203
Merge branch 'grub' of git://github.com/ts468/nixpkgs
...
Fix grubTarget on nodev installs
2015-02-20 07:47:06 -05:00
tv
86cb16965a
exim: add version 4.85 incl. nixos module
2015-02-20 10:49:15 +01:00
Shea Levy
3e44f99055
Fix grub 1 install
2015-02-19 19:33:17 -05:00
Sander van der Burg
8d29cb2b00
In a test VM it's impossible to connect to itself, so fix this
2015-02-19 21:13:49 +00:00
Eelco Dolstra
5762f8f95c
Add options to support signed binary caches
...
Typical use:
nix.requireSignedBinaryCaches = true;
nix.binaryCachePublicKeys = [ "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ];
(The public key of cache.nixos.org is included by default.)
Note that this requires Nix 1.9 and that most of cache.nixos.org
hasn't been signed yet.
2015-02-19 14:22:43 +01:00
Jaka Hudoklin
ebfadc2fc9
Merge pull request #6452 from rushmorem/update-chronos-port
...
Update chronos default port
2015-02-19 14:13:00 +01:00
rushmorem
74b40e9a43
Add marathon mesos framework
2015-02-19 13:30:00 +02:00
rushmorem
a661802d29
Update chronos default port
...
Update chronos default port to match the one documented on
their website (http://airbnb.github.io/chronos ). The one in
their repo (the current one) clashes with the marathon documented
one.
2015-02-19 12:31:12 +02:00
Eelco Dolstra
4ac280ec49
Blacklist the nouveau driver on EC2
2015-02-18 13:04:10 +01:00
Sou Bunnbu
f8dbd6f9ae
Merge pull request #6427 from grwlf/vsftpd-port
...
vsftpd.nix: add 'portPromiscuous' option
2015-02-18 19:18:34 +08:00
Sergey Mironov
ac65a757f0
vsftpd.nix: add 'portPromiscuous' option
2015-02-18 11:51:43 +03:00
Mathijs Kwik
2fe44b95d0
nixos/wpa_supplicant: fix conflicting documentation
...
fixes #6298
2015-02-17 22:16:20 +01:00
James Cook
6daf9aa922
Merge pull request #5995 from ts468/qemu-vm
...
Update QEMU Nixos Virtual Machine
2015-02-16 13:13:26 -08:00
Thomas Strobel
c61ff9b51e
Fix grubTarget on nodev installs
2015-02-16 20:19:44 +01:00
Thomas Strobel
80afabd5b5
Update QEMU Nixos Virtual Machine
...
The Nixos Qemu VM that are used for VM tests can now start without
boot menu even when using a bootloader.
The Nixos Qemu VM with bootloader can emulate a EFI boot now.
2015-02-16 20:07:42 +01:00
Evgeny Egorochkin
4621f16b34
azure: add a job to download ssh host and root keys if they are made available via "custom data"; see #3986
2015-02-16 16:54:30 +02:00
Eelco Dolstra
5d7000df68
Automatically set nix.nrBuildUsers to at least nix.maxJobs
2015-02-16 12:02:49 +01:00
Wout Mertens
65438da88a
Merge pull request #6357 from NixOS/jobs-vs-users
...
nix-daemon: Sanity check maxJobs vs nrBuildUsers
2015-02-16 11:42:24 +01:00
Rob Vermaas
824fccd3e9
Move amazon option out of amazon-image.nix, needed to make ec2.hvm usable from nixops, without breaking evaluation for other backends.
...
(cherry picked from commit 213fe8427c5ce455b893c0c5c56cc38175bf36b7)
2015-02-16 09:57:19 +00:00
Eelco Dolstra
5092d625d6
/etc/ssl/certs/ca-bundle.crt -> ca-certificates.crt
...
Even though there is no "official" standard location, it's better to
stick to what most distros are using.
2015-02-15 19:06:31 +01:00