Eelco Dolstra
94daecd90b
save-hwclock.service: support time.hardwareClockInLocalTime
2012-07-16 17:32:26 -04:00
Eelco Dolstra
44d091674b
Merge branch 'master' of github.com:NixOS/nixos into systemd
...
Conflicts:
modules/config/networking.nix
modules/services/networking/ssh/sshd.nix
modules/services/ttys/agetty.nix
modules/system/boot/stage-2-init.sh
modules/system/upstart-events/shutdown.nix
2012-07-16 17:27:11 -04:00
Eelco Dolstra
1d57489427
Global replace /var/run/opengl-driver -> /run/opengl-driver
2012-07-16 11:34:21 -04:00
Eelco Dolstra
98459eb675
Global replace /var/run/booted-system -> /run/booted-system
2012-07-16 11:34:21 -04:00
Eelco Dolstra
73532c3855
Global replace /var/run/current-system -> /run/current-system
2012-07-16 11:34:21 -04:00
Shea Levy
8c24de13e4
D'oh
2012-07-16 08:11:44 -04:00
Shea Levy
cdd8ecf9c7
multitouch: Invert left-right scrolling when invertScroll is enabled
2012-07-16 08:03:47 -04:00
Shea Levy
3d2b83c110
multitouch: Add an option to ignore palm touches
2012-07-14 21:40:49 -04:00
Shea Levy
c909ea9208
multitouch: Add option to invert scroll
2012-07-14 18:02:46 -04:00
Shea Levy
e3337c7f05
Add module for b43 firmware
2012-07-13 23:54:41 -04:00
Eelco Dolstra
57d74e6f4f
openssh.authorizedKeys.keyFiles: allow multiple keys
...
Ugly hack to get around the error "a string that refers to a store
path cannot be appended to a path". The underlying problem is that
you cannot do
"${./file1} ${./file2}"
but you can do
" ${./file1} ${./file2}"
Obviously we should allow the first case as well.
2012-07-13 17:59:03 -04:00
Eelco Dolstra
7e77dae458
sshd.nix: Create ~/.ssh/authorized_keys with the right ownership
2012-07-13 11:48:47 -04:00
Eelco Dolstra
7fca8ceaf8
/etc/login.defs: set the mode of new home directories to 700
2012-07-13 10:41:48 -04:00
Shea Levy
8544ba285d
logstash: Fix sloppy description fields
2012-07-12 14:35:06 -04:00
Shea Levy
a2b59f595f
logstash: Export config.lib.logstash.mk{Float,Hash,NameValuePairs}.
...
This allows hiding the implementation details for how to represent logstash
config types that don't directly map to nix expressions, particularly floats,
hashes, and name-value pair sets with repeated names. Instead of setting
__type and value directly, the user now uses these convenience functions to
generate their logstash config.
2012-07-12 14:15:43 -04:00
Shea Levy
8712e1dafc
Add lib module for modules to provide helper functions
2012-07-12 13:46:04 -04:00
Peter Simons
0c12e29368
Don't add the i3 window manager to the system if it isn't enabled in configuration.nix.
2012-07-12 11:33:10 +02:00
Eelco Dolstra
7de6a7e8b0
Rename time.clockLocal -> time.hardwareClockInLocalTime.
2012-07-11 15:33:34 -04:00
Carles Pagès
008493f94c
Add option to keep hardware clock in local time.
2012-07-11 15:31:46 -04:00
Shea Levy
5412b1089f
logstash: Start process in /tmp
...
See https://logstash.jira.com/browse/LOGSTASH-107
2012-07-11 13:45:36 -04:00
Shea Levy
315087def1
logstash: use {name=; value='} attrsets for repeated name-value pairs instead of parallel lists
2012-07-11 11:59:00 -04:00
Shea Levy
3039caf5ad
Add logstash module.
...
Since the logstash config file seemed very similar to a nixexpr, I decided
to map directly from nixexprs to logstash configs. I didn't realize until
too far in that this solution was probably way over-engineered, but it
works.
2012-07-11 11:22:16 -04:00
Rok Garbas
b7398794ed
i3 window manager was not installed when enabled
2012-07-10 16:07:53 +02:00
Eelco Dolstra
fbf9ecf78a
Apache: make /var/run/httpd readable to wwwrun, as required by mod_cgid
2012-07-09 16:27:39 +02:00
Eelco Dolstra
d0c9a3ce32
Apache: build PHP against the right httpd
...
If httpd is built with a threaded MPM, then PHP needs to be built with
thread support as well.
2012-07-06 23:28:46 +02:00
Eelco Dolstra
18031e41bb
Apache: Add an option to set the MPM
...
Supported values are "prefork" (default), "worker" and "event"
(experimental in Apache 2.2 but not 2.4).
2012-07-06 14:23:55 -04:00
Eelco Dolstra
a07eb262a0
Apache: don't fork into the background due to Upstart weirdness
...
If Apache crashes during startup, Upstart for some reason shows the
job in the "start/running" state. As a workaround, don't fork.
2012-07-06 13:47:42 -04:00
Eelco Dolstra
46dce21bff
MediaWiki: Generalise the skins support
...
The new option ‘skins’ allows specifying a list of directories
providing skins to be added to the MediaWiki installation. The
‘defaultSkin’ option just sets the default.
2012-07-05 21:04:23 +02:00
Mathijs Kwik
a630b1f6f6
EFI shell got updated upstream, reflecting new hash
2012-07-05 08:31:44 +02:00
Eelco Dolstra
348691645d
Remove broken "nopipefail" option
...
http://hydra.nixos.org/build/2751337
2012-07-02 10:57:36 -04:00
Peter Simons
56373744b4
modules/config/networking.nix: recognize whether a local DNS resolver is available
...
resolvconf prefers a locally running BIND resolver over the forwarders; we just
have to tell it whether we have one or not. We use 'config.services.bind.enable'
to make that decision, assuming that people are not going to configure a local
BIND that won't respond to queries on 127.0.0.1. If we run into such a (weird)
case, then we'll need to introduce another variable for that purpose which can
be set independently from 'config.services.bind.enable'.
2012-07-02 15:01:02 +02:00
Peter Simons
f22dbd5e05
modules/services/networking/wpa_supplicant.nix: strip trailing whitespace
2012-06-29 11:53:16 +02:00
Peter Simons
61b8ee9029
modules/services/networking/wpa_supplicant.nix: document that interface auto-detection doesn't work on Linux 3.4.x
2012-06-29 11:53:16 +02:00
Eelco Dolstra
bf15293b1e
Merge branch 'master' of github.com:NixOS/nixos into systemd
...
Conflicts:
modules/services/hardware/udev.nix
2012-06-28 14:19:38 -04:00
Eelco Dolstra
76c74cd7c7
initrd: Detect filesystem type before doing fsck/mount
...
BusyBox doesn't handle the "auto" filesystem type very well: fsck will
just ignore such filesystems, and mount will only work properly if the
required kernel module is already loaded. Therefore, use blkid to
determine the filesystem type.
Also generate an /etc/fstab in the initrd rootfs on the fly. This is
useful if you're dropped into an emergency shell since it allows you
to say "fsck /dev/sda1" or "mount /dev/sda" and have the right thing
happen.
2012-06-28 10:55:44 -04:00
viric
7acfd8ec20
Merge pull request #9 from viric/pull-pipefail
...
nixos-rebuild: make 'pull' fail in case it did not pull anything.
2012-06-28 01:20:22 -07:00
Lluís Batlle i Rossell
34e8f68056
system-tarball-pc: not use boot.initrd.extraTools anymore
...
Eelco removed the option recently, making the default initrd have the full
busybox.
I saw this evaluation error in the hydra nixos trunk page.
2012-06-27 22:26:27 +02:00
Lluís Batlle i Rossell
de87b07bb3
nixos-rebuild: fail if any case of pull fails.
2012-06-27 21:57:15 +02:00
Lluís Batlle i Rossell
5b7c019e2a
nixos-rebuild: make 'pull' fail in case it did not pull anything.
2012-06-27 21:36:46 +02:00
David Guibert
dbe2325603
fix the grep pattern finding programs called by absolute paths in udev rules.
2012-06-27 20:41:07 +02:00
Shea Levy
bb5d2d53fe
try isn't used, so use the more compatct seq 10
2012-06-27 09:43:54 -04:00
Mathijs Kwik
061a998840
luks root: c-style for-loop -> seq
...
The ash shell no longer supports this bash-specific syntax.
This left systems that use luksroot unable to boot.
2012-06-27 09:42:55 -04:00
Eelco Dolstra
e64bdda52b
Don't use weird 777 permissions on unmounted /dev/shm
2012-06-27 09:35:53 -04:00
Eelco Dolstra
cc357c7e64
nixos-rebuild: Add a convenience option ‘--upgrade’
...
This is equivalent to running ‘nix-channel --update nixos’ before
running ‘nixos-rebuild’.
2012-06-25 16:17:34 -04:00
Eelco Dolstra
a85555cd27
Remove the obsolete --no-pull option from the nixos-rebuild man page
2012-06-25 16:08:19 -04:00
Eelco Dolstra
7613ae950a
Fix booting on EC2
...
The kill command in ash doesn't know the "--" syntax, but doesn't need
it either.
2012-06-24 19:02:34 -04:00
Eelco Dolstra
bd0f065c05
Merge branch 'master' of github.com:NixOS/nixos into systemd
2012-06-22 18:20:26 -04:00
Eelco Dolstra
6bd32f0a27
Drop the socat wrapper
2012-06-22 15:37:22 -04:00
Eelco Dolstra
82019c01bb
Test driver: exit when all VMs have exited rather than sleeping forever
2012-06-22 14:31:07 -04:00
Eelco Dolstra
1da7cea223
Add Busybox to the installation CD
...
This is mostly to get the automated tests to succeed.
2012-06-22 14:16:55 -04:00