1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Commit graph

1766 commits

Author SHA1 Message Date
Luca Bruno 7885c2ed12 Revert "nixos: iso-image: use syslinux bootloader for USB booting support"
This reverts commit 455db168b3.
2014-11-08 14:33:27 +01:00
Luca Bruno e3611709d6 Revert "nixos: installation: make installation ISOs USB bootable"
This reverts commit b7f6a138b1.
2014-11-08 14:33:27 +01:00
Jaka Hudoklin 53667c7b1a Merge pull request #4870 from bosu/docker-proxy
docker: propagate nix.proxy into daemon environment
2014-11-08 13:06:56 +01:00
Boris Sukholitko 0d89afdedd docker: propagate nix.proxy into daemon environment 2014-11-07 13:46:36 +02:00
Rickard Nilsson 71f64ded06 Revert "Revert "syslog-ng: Update from 3.5.6 to 3.6.1""
This reverts commit 8e1072fd60.
2014-11-06 21:59:04 +01:00
Rickard Nilsson 2b3c3d0e32 Fixes to Apache 2.4 configuration 2014-11-06 21:58:40 +01:00
Eelco Dolstra b3eb981a95 apache-httpd: Make 2.4 the default
The NixOS 14.11 release is a good time to finally make 2.4 the
default.
2014-11-06 14:55:44 +01:00
Evgeny Egorochkin 85d23f5292 thermald needs dbus config files to run 2014-11-06 15:19:33 +02:00
Peter Simons 02c37c1027 Merge pull request #4838 from abbradar/ssmtp-root
Add 'root' option to ssmtp
2014-11-05 15:45:47 +01:00
Nikolay Amiantov 1b6f0ffb6e ssmtp: add 'root' option 2014-11-05 02:47:59 +03:00
Nikolay Amiantov 292e07689a ssmtp: add types to options 2014-11-05 02:42:48 +03:00
Jaka Hudoklin d232390d5d nixos/graphite: fix user creation 2014-11-04 19:38:24 +01:00
Ricardo M. Correia 98a59df81f nixos/transmission: Start after local-fs.target 2014-11-04 18:40:13 +01:00
Eelco Dolstra c7ee917197 Fix tests.runInMachine evaluation 2014-11-04 14:28:09 +01:00
aszlig 8e516de3e7
nixos: Fix priorities of initialHashedPassword.
Regression introduced in f496c3cbe4.

Previously when we used security.initialRootPassword, the default
priority for this option was 1001, because it was a default value set by
the option itself.

With the mentioned commit, it is no longer an option default but a
mkDefault, which is priority 1000.

I'm setting this to 150 now, as test-instrumentation.nix is using this
for overriding other options and because I think it still makes it
possible to simple-override it, because if no priority is given, we get
priority 100.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-04 05:19:07 +01:00
lethalman 636a4c00ca Merge pull request #4801 from robberer/pkgs/zabbix-server
zabbix-server: add extraConfig option
2014-11-04 00:32:46 +01:00
Peter Simons b5fed52c43 Merge pull request #4238 from wkennington/master.boost
Make boost 156 the default
2014-11-03 23:03:01 +01:00
Longrin Wischnewski ce8e1a278b zabbix-server: add extraConfig option
add types to options
2014-11-03 16:47:07 +01:00
Eelco Dolstra f496c3cbe4 Obsolete security.initialPassword
You can now set users.extraUsers.root.initialHashedPassword instead.
2014-11-03 12:36:56 +01:00
Eelco Dolstra f8f787b800 Handle initialPassword and initialHashedPassword for !mutableUsers
In this case, they're equivalent to setting ‘password’ and
‘hashedPassword’ (since there is no distinction between an initial and
non-initial user account state).
2014-11-03 12:32:32 +01:00
Eelco Dolstra 3696536115 Handle removing a password if mutableUsers = false 2014-11-03 12:32:27 +01:00
Eelco Dolstra 1b53a3fcb7 Add initialPassword and initialHashedPassword options
These are like password and hashedPassword, except that they only
apply when the user is initially created.
2014-11-03 12:32:19 +01:00
William A. Kennington III 8e1072fd60 Revert "syslog-ng: Update from 3.5.6 to 3.6.1"
This reverts commit e2ada42623.
2014-11-02 17:22:28 -08:00
William A. Kennington III 5ae216558f jfsrec: Remove derivation 2014-11-02 17:22:27 -08:00
Bob van der Linden b7f6a138b1 nixos: installation: make installation ISOs USB bootable 2014-11-02 17:35:16 +01:00
Bob van der Linden 455db168b3 nixos: iso-image: use syslinux bootloader for USB booting support
This changes the bootloader for iso generation from Grub to
syslinux. In addition this adds USB booting support, so that
"dd" can be used to burn the generated ISO to USB thumbdrives
instead of needing applications like UnetBootin.
2014-11-02 17:35:16 +01:00
lethalman 560fd3a5b7 Merge pull request #4742 from abbradar/bcache-stage1
Support bcache volumes in initrd
2014-11-02 17:29:38 +01:00
Nikolay Amiantov 775f381a9e stage-1: add bcache support
This adds necessary udev rule into initrd to support autodetecting
bcache partitions in stage-1. It also fixes 'sh' path for the new
rule to work.
2014-11-02 19:03:50 +03:00
Luca Bruno 5d2b3ff8cf nixos: increase allocated memory for gnome tests. Closes #4651 2014-11-02 16:33:10 +01:00
Mathijs Kwik f356cee747 sudo: allow adding extra configuration options to the bottom of sudoers
from sudoers (5):
When multiple entries match for a user, they are applied in order.
Where there are multiple matches, the last match is used (which is not necessarily the most specific match).
2014-11-02 13:27:05 +01:00
Peter Simons 415f41bf68 nixos/modules/services/monitoring/graphite.nix: strip trailing whitespace 2014-11-02 12:40:00 +01:00
Peter Simons 96a7e65c37 nixos/modules/services/monitoring/graphite.nix: don't create graphite user unconditionally
I'm not sure what exactly this user is needed for, i.e. under what circumstances
it must exist or not, but creating it unconditionally seems like the wrong thing
to do. I complained to @offlinehacker about this on Github, but got no response
for a week or so. I'm disabling the extraUsers bit to put out the fire, and now
hope that someone who actually knows about Graphite implements a proper solution
later.
2014-11-02 12:34:16 +01:00
Nikolay Amiantov 5423f62373 gitolite: add dataDir 2014-11-02 02:24:41 +03:00
lethalman f079cd1721 Merge pull request #4750 from abbradar/nix-maxcores
Add buildCores option to nix
2014-11-01 22:01:39 +01:00
Nikolay Amiantov e8dace201f nix-daemon: add maxCores option 2014-11-01 23:58:21 +03:00
William A. Kennington III ba53392bce nixos/nat: Fix override so that sysctls are properly preserved 2014-10-31 16:50:25 -07:00
Eelco Dolstra a9f5e77e2f update-users-groups.pl: Generate hashed passwords internally
I.e. don't call "passwd" to update /etc/shadow from the "password"
option. This has the side-effect of not updating the password if
mutableUsers = true (since the code path for "hashedPassword" has a
check for mutableUsers).

Fixes #4747.
2014-10-31 17:42:09 +01:00
Peter Simons e18e77fbcd Merge pull request #4746 from abbradar/synaptics-fingers
Add "fingersMap" option to Synaptics
2014-10-31 11:06:58 +01:00
Nikolay Amiantov 118096fc0b synaptics: add fingersMap option 2014-10-31 12:45:54 +03:00
Nikolay Amiantov 0eb86647b3 synaptics: add types to options 2014-10-31 12:45:54 +03:00
Aristid Breitkreuz 93f2c180d0 rsnapshot: add git version & make it configurable in the nixos module 2014-10-27 20:38:39 +01:00
Kirill Elagin 0c6d49da7d xsession: Start the right pulseaudio binary
Fixes #4663.
2014-10-27 15:43:19 +03:00
Rickard Nilsson e2ada42623 syslog-ng: Update from 3.5.6 to 3.6.1
Also update the NixOS module, syslog-ng now automatically listens to
the systemd journal, so we don't have to set up syslog.socket.
2014-10-27 12:22:22 +01:00
Rob Vermaas 5a23232edf Refactor EC2 image generation script. Now uses same procedure for both hvm and pv-grub
images. Root disks are now SSD backed and 20GB by default, both on hvm and pv-grub
(previously was 8GB for HVM). Added new eu-central region to the locations to copy images
to. Also the root disk for HVM instances was not deleted on termination with previous
images, this is fixed as well.
2014-10-27 11:48:43 +01:00
Eelco Dolstra 63d7ad74e7 Add nodejs to the small channel
(cherry picked from commit d927ce03e4)
2014-10-27 10:40:49 +01:00
lethalman 40b5aa1d33 Merge pull request #4506 from cstrahan/logstash-config
logstash service: make log verbosity configurable.
2014-10-26 20:10:03 +01:00
William A. Kennington III 8636d93f54 Merge pull request #4213 from wkennington/master.zfsiso
[Dont Merge] nixos-iso: Add zfs / btrfs to supportedFilesystems
2014-10-25 18:01:17 -07:00
Aristid Breitkreuz dabdab8dce Merge pull request #4640 from lethalman/installer-icons
kde installer: Add gparted, nixos manual and konsole in the desktop
2014-10-25 16:32:56 +02:00
Luca Bruno 9e1ab43459 gnome3: Add cantarell fonts. Closes #4633 2014-10-24 11:50:47 +02:00
Luca Bruno e553e27f48 kde installer: Add gparted, nixos manual and konsole in the desktop 2014-10-23 18:59:25 +02:00