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
Eelco Dolstra
980ba4d5a5
stage-1: mount /proc, /sys, /dev in the target root
...
The switch_root in BusyBox doesn't do this (while the one in
util-linux does). So we have to do this ourselves.
2012-06-22 13:51:42 -04:00
Eelco Dolstra
598adfee3e
Fix booting from the CD-ROM
...
So it turns out that BusyBox doesn't auto-load modules for filesystems
that have type "auto", e.g. it doesn't figure out that it should load
the "iso9660" module should be loaded when mounting the CD-ROM. We
don't want to give the root FS on the CD type "iso9660", because that
breaks booting from a USB stick created by unetbootin. So make sure
the "iso9660" module is loaded.
2012-06-22 11:55:23 -04:00
Eelco Dolstra
7b54922227
Don't include klibc in the installation CD
2012-06-22 11:39:27 -04:00
Eelco Dolstra
872a76b177
Merge branch 'master' of github.com:NixOS/nixos into systemd
2012-06-22 11:11:21 -04:00
Eelco Dolstra
9692495df0
Use BusyBox in the initrd
...
Using BusyBox instead of Bash plus a bunch of other tools gives us a
much more feature-full, yet smaller initrd. In particular, BusyBox
contains networking commands such as ip and a DHCP client, useful for
NFS boots. It's also much more convenient for rescue situations
because the shell has builtin readline support and there are many more
tools (including vi).
2012-06-22 10:43:06 -04:00
Eelco Dolstra
70089950d2
nixos-version: "pre-svn" -> "pre-git"
2012-06-22 10:28:06 -04:00
Rob Vermaas
df124ebc89
* Make sure time.timeZone can only be defined once.
2012-06-21 12:47:44 +02:00
Eelco Dolstra
055eae2a58
Merge pull request #1 from aszlig/i3_integration
...
Add xserver integration of i3 WM.
2012-06-20 20:49:45 -07:00
Eelco Dolstra
337423af8e
Backdoor: depend on /dev/hvc0
...
Systemd is the shit: units can declare a dependency on the appearance
of device nodes. Yay!
2012-06-19 17:36:02 -04:00
Eelco Dolstra
2fa1ba85c6
Enable the systemd password agents
2012-06-19 17:02:54 -04:00
Eelco Dolstra
2526afb1c7
Don't use ConsoleKit
2012-06-19 16:22:26 -04:00
Eelco Dolstra
d692a0807a
Don't mount /dev/pts since systemd does that for us
2012-06-19 15:25:56 -04:00
Eelco Dolstra
cacd608c37
Mount devtmpfs in the initrd
...
It seems that udev now requires devtmpfs, so enable it.
2012-06-19 15:15:40 -04:00
Eelco Dolstra
cd7872b758
Drop dependency on the old udev
2012-06-19 15:14:54 -04:00
Eelco Dolstra
dab6bbe3a6
Set the default unit to "graphical.target" if X11 is enabled
2012-06-19 14:51:04 -04:00
Eelco Dolstra
2b305d7f29
Remove accidentally committed line
2012-06-19 14:50:23 -04:00
Eelco Dolstra
f213c4ca29
Don't run syslogd and klogd
...
The systemd journal removes the need for running syslogd and klogd, so
don't start them.
2012-06-19 09:28:04 -04:00
