Commit graph

892 commits

Author SHA1 Message Date
Lluís Batlle i Rossell b47c2186f6 Adding logrotate to nixos. Not a very clever logrotate, though:
options 'enable' (cronjob every hour) and the config flie contents passed
as a string.


svn path=/nixos/trunk/; revision=21438
2010-04-29 18:54:08 +00:00
Rob Vermaas 310eefffe7 added virtualisation.diskSize option to specify default image size of disk in qemu-kvm vm
svn path=/nixos/trunk/; revision=21422
2010-04-29 12:37:26 +00:00
Marc Weber ce642f0cc2 nixos-rebuild: accept both: -jn and -j n
svn path=/nixos/trunk/; revision=21410
2010-04-28 19:52:03 +00:00
Marc Weber 8754644faf add more documentation to distributedBuilds and what can be done if buildmachines are not always up
svn path=/nixos/trunk/; revision=21409
2010-04-28 19:52:00 +00:00
Marc Weber d1e87dfc86 adding two new options:
- system.copySystemConfiguration (requested by Ludovic Courtès)
- system.extraSystemBuilderCmds

svn path=/nixos/trunk/; revision=21406
2010-04-28 14:55:26 +00:00
Yury G. Kudryashov ce15e270f2 Fix non-bc change
svn path=/nixos/trunk/; revision=21326
2010-04-26 15:57:06 +00:00
Yury G. Kudryashov 69697a35bb Add /root/test-firmware to FIRMWARE_DIRS
svn path=/nixos/trunk/; revision=21317
2010-04-26 09:08:05 +00:00
Yury G. Kudryashov be3df19bd5 Don't try to copy /root/test-firmware to /nix/store
svn path=/nixos/trunk/; revision=21316
2010-04-26 09:04:24 +00:00
Yury G. Kudryashov 226a9c8bbb Update CUPS module
* Create symlinks in cups-progs only if they aren't already here
* add tmpDir option

svn path=/nixos/trunk/; revision=21309
2010-04-25 18:27:00 +00:00
Yury G. Kudryashov a5718503e5 Change firmware handling
This way should work with both old udev and new one.

svn path=/nixos/trunk/; revision=21308
2010-04-25 18:26:56 +00:00
Yury G. Kudryashov a30637aba5 Really use nix-worker in nixos-rebuild
svn path=/nixos/trunk/; revision=21307
2010-04-25 18:26:51 +00:00
Sander van der Burg d9528767af Added preliminary Apache Felix service
svn path=/nixos/trunk/; revision=21244
2010-04-22 15:13:50 +00:00
Lluís Batlle i Rossell a37743794d I forgot a 'toString' in front of an integer
svn path=/nixos/trunk/; revision=21242
2010-04-22 14:54:09 +00:00
Lluís Batlle i Rossell d7406769ac Making /var/run/utmp writable by the 'utmp' group.
Then, people can choose a setgid utmp for their xterm, konsole or whatever to get the terminals
reported there.


svn path=/nixos/trunk/; revision=21238
2010-04-22 13:56:26 +00:00
Lluís Batlle i Rossell b7dab319e5 Fixing the tty group and permissions for vt consoles
svn path=/nixos/trunk/; revision=21231
2010-04-22 10:11:32 +00:00
Lluís Batlle i Rossell 41bf426a66 Making the httpd prefork basic settings configurable.
I kept the defaults as they where, to avoid surprises.
(150 httpd processes simultaneously answering? Too much for my machines)


svn path=/nixos/trunk/; revision=21220
2010-04-21 20:55:57 +00:00
Eelco Dolstra 8874226fa3 * Add rfkill to the system path.
svn path=/nixos/trunk/; revision=21201
2010-04-21 11:37:52 +00:00
Eelco Dolstra 6c16ff29a5 * Don't do "kbd_mode -u" because it kicks the X server out of raw
mode, and isn't needed anyway.

svn path=/nixos/trunk/; revision=21182
2010-04-20 14:35:12 +00:00
Sander van der Burg 2936d7062d Added creation of the disnix group on first startup, if the disnix service is enabled
svn path=/nixos/trunk/; revision=21164
2010-04-19 13:26:21 +00:00
Lluís Batlle i Rossell a008d6b391 Fixing the cups-progs build problems, for the cupsd module. It wrote over other
store paths.


svn path=/nixos/trunk/; revision=21161
2010-04-19 10:54:39 +00:00
Lluís Batlle i Rossell 33ed225a84 Making the /dev and /dev/shm tmpfs sizes configurable.
By default, they take the usual value of "50% of physical RAM".

As /dev/shm can be filled by anyone, and tmpfs does not trigger the OOM killer (and
can hang the machine due to a lack of RAM), I need to configure that down
in order to avoid crashes.

There is still left the /var/run/nscd tmpfs filesystem, also created with 50%
of the RAM, but at least not writeable by anyone. We could find a reasonable
low value for that, or allow configuration.


svn path=/nixos/trunk/; revision=21140
2010-04-17 15:20:13 +00:00
Sander van der Burg 1c9eb048c9 - Implemented rootPassword option to automatically configure the root password (by default it's empty, which you usually don't want)
- Implemented initialScript option to configure database properties on first startup (such as granting permissions)


svn path=/nixos/trunk/; revision=21135
2010-04-16 18:06:23 +00:00
Rob Vermaas 94e36ec1c7 virtualisation/qemu-kvm.nix: use noacl option for hostfs mount
svn path=/nixos/trunk/; revision=21129
2010-04-16 15:53:54 +00:00
Rob Vermaas 46b109e97e revert previous commit
svn path=/nixos/trunk/; revision=21128
2010-04-16 15:45:59 +00:00
Rob Vermaas b75d15a9a8 virtualisation: add option to switch off readonly host fs in vm
svn path=/nixos/trunk/; revision=21126
2010-04-16 15:09:47 +00:00
Yury G. Kudryashov 8e8554242f Remove extraLinkPaths, thanks to Pierron for explanation
Now pathsToLink=["/include"] in configuration.nix will add /include instead of overwriting.

svn path=/nixos/trunk/; revision=21111
2010-04-16 05:09:10 +00:00
Marco Maggesi c423f16f69 Fix job name in nixos/modules/programs/blcr.nix
svn path=/nixos/trunk/; revision=21106
2010-04-15 17:14:44 +00:00
Yury G. Kudryashov 267e0af8db A few typos in previous commits
svn path=/nixos/trunk/; revision=21105
2010-04-15 17:02:33 +00:00
Yury G. Kudryashov 1e83fe6122 Remove tabs
svn path=/nixos/trunk/; revision=21104
2010-04-15 15:47:26 +00:00
Yury G. Kudryashov 8324ccf755 Add /var/run/current-system/sw to NIX_PROFILES
Also adds a possibility to just add KDE packages to systemPackages.

svn path=/nixos/trunk/; revision=21103
2010-04-15 15:47:15 +00:00
Yury G. Kudryashov a26d31d04c Add support for custom CUPS drivers
Use buildEnv for cups-prog.

svn path=/nixos/trunk/; revision=21102
2010-04-15 15:47:07 +00:00
Yury G. Kudryashov dcd0be3351 Allow additions to pathsToLink
svn path=/nixos/trunk/; revision=21101
2010-04-15 15:46:55 +00:00
Yury G. Kudryashov 4d39d70406 Start ssh-agent or gpg-agent even if called by kdm
svn path=/nixos/trunk/; revision=21100
2010-04-15 15:46:47 +00:00
Yury G. Kudryashov 916fbfa070 Add xf86-linux-wacom.
Mostly reverts my previous commit.

svn path=/nixos/trunk/; revision=21099
2010-04-15 15:46:38 +00:00
Marco Maggesi 37746e4fb3 Add support for BLCR: modules/programs/blcr.nix
svn path=/nixos/trunk/; revision=21092
2010-04-15 12:11:33 +00:00
Rob Vermaas b42c2ecc13 * tomcat module: access logging per virtual host and pass right timezone
svn path=/nixos/trunk/; revision=21065
2010-04-14 09:31:23 +00:00
Lluís Batlle i Rossell 4c9ff7f904 Making postfix properly start on boot.
We could not start on 'filesystems', because filesystems is written as an upstart task.

Additionally, as upstart calls the postfix start/stop script and it does not act as a
daemon, we write it as a preStart/postStop job. Then we don't have monitoring or respawn,
but at least upstart does not get confused on its state.


svn path=/nixos/trunk/; revision=21061
2010-04-13 22:47:34 +00:00
Yury G. Kudryashov 9cce36182d Remove linuxwacom: it is not compatible with new xserver
svn path=/nixos/trunk/; revision=21015
2010-04-11 20:41:06 +00:00
Yury G. Kudryashov eea1660532 no-x-libs: s/sshd/openssh/
svn path=/nixos/trunk/; revision=21009
2010-04-11 14:47:06 +00:00
Andres Löh 289dcec9db Make acpid actions configurable.
svn path=/nixos/trunk/; revision=20986
2010-04-08 15:27:20 +00:00
Eelco Dolstra 6c710f7d2b * Provide an example for services.printing.cupsdConf.
* Change the default CUPS log level to "info".

svn path=/nixos/trunk/; revision=20957
2010-04-06 13:25:00 +00:00
Eelco Dolstra 755ee8bd08 * Add a configuration option `services.printing.cupsdConf' to allow
appending verbatim text to the CUPS daemon configuration file.
* cupsd.conf: set ErrorLog properly.

svn path=/nixos/trunk/; revision=20954
2010-04-06 11:57:15 +00:00
Sander van der Burg 02e4a78c71 Disnix should also remain active during a switch
svn path=/nixos/trunk/; revision=20949
2010-04-05 20:35:08 +00:00
Sander van der Burg b904954793 Updated disnix service for the 0.1 release
svn path=/nixos/trunk/; revision=20917
2010-04-01 14:53:17 +00:00
Michael Raskin 6788d457dc Make security type configurable
svn path=/nixos/trunk/; revision=20667
2010-03-16 17:17:37 +00:00
Michael Raskin 11f8647d73 Add a default share to Samba to make creating simple fileserver easier
svn path=/nixos/trunk/; revision=20665
2010-03-16 16:34:27 +00:00
Eelco Dolstra bd81b7a173 * Urgh, this should never have been committed.
svn path=/nixos/trunk/; revision=20660
2010-03-16 15:15:17 +00:00
Eelco Dolstra c1e313b5e1 * Remove obsolete references to kernelPackages in Nixpkgs.
svn path=/nixos/trunk/; revision=20647
2010-03-16 12:10:06 +00:00
Eelco Dolstra 5b5aefa030 * Remove some obsolete stuff.
svn path=/nixos/trunk/; revision=20631
2010-03-15 13:41:21 +00:00
Ludovic Courtès 18542f6424 GNU: Don't require modules since we don't need to.
svn path=/nixos/trunk/; revision=20584
2010-03-11 22:54:47 +00:00
Eelco Dolstra 176f6c52dd * Change the name of the SSH privilege separation user account back to
"sshd" because changing it to "opensshd" causes breakage (like the
  activation script saying "useradd: UID 2 is not unique.").  Also,
  OpenSSH requires it to be named "sshd", I think.

svn path=/nixos/trunk/; revision=20577
2010-03-11 18:07:20 +00:00
Ludovic Courtès a6b89666fd First stab at a GNU module.
svn path=/nixos/trunk/; revision=20576
2010-03-11 17:02:57 +00:00
Ludovic Courtès 8e16742b79 Update users of `services.sshd'.
svn path=/nixos/trunk/; revision=20575
2010-03-11 17:02:53 +00:00
Ludovic Courtès d1b4b7fd28 Rename services.sshd' to services.openssh'.
svn path=/nixos/trunk/; revision=20574
2010-03-11 17:02:49 +00:00
Ludovic Courtès bcd3cd85f3 installation-cd: Add an `installer.basePackages' option.
svn path=/nixos/trunk/; revision=20573
2010-03-11 17:02:36 +00:00
Eelco Dolstra a104f07a07 * Move the definition of the Nix build users out of user-groups.nix to
nix-daemon.nix.
* Add an option ‘nix.nrBuildUsers’ to allow the number of build users
  to be overriden.

svn path=/nixos/trunk/; revision=20571
2010-03-11 16:50:08 +00:00
Lluís Batlle i Rossell 9f5d77f78d Still problems with nfs-kernel with only the client enabled.
Fix the upstart script 'start on' part.

svn path=/nixos/trunk/; revision=20555
2010-03-11 12:56:40 +00:00
Lluís Batlle i Rossell 48e9e1282a Fixing the evaluation of the "system tarball pc", adapting it to the latest
nixpkgs changes about 'platform'.


svn path=/nixos/trunk/; revision=20494
2010-03-09 14:37:59 +00:00
Eelco Dolstra 43d6b17d87 * In the NixOS tests, send syslog messages to the serial port (so that
they appear in the build log of the test).

svn path=/nixos/trunk/; revision=20490
2010-03-09 13:31:20 +00:00
Lluís Batlle i Rossell dfb89ec8c3 nfs: the statd daemon should be started after nfs only if the nfs server is
enabled.

OTH, I don't know why statd may depend at all on nfsd being started.


svn path=/nixos/trunk/; revision=20402
2010-03-05 11:05:37 +00:00
Eelco Dolstra 1065e86642 * In nixos-rebuild, build config.environment.nix before trying nixFallback or nixUnstable.
svn path=/nixos/trunk/; revision=20376
2010-03-04 14:38:53 +00:00
Sander van der Burg 787b5cd7b9 Implemented enableOSSEmulation option, which can be used to disable OSS emulation. On my home PC OSS emulation gives me a lot of annoying problems
svn path=/nixos/trunk/; revision=20351
2010-03-03 14:01:13 +00:00
Sander van der Burg 3d87a133a0 Added gstreamer plugins to the systemPackages, so that Phonon does not crash on shutdown when using KDE 4.4.x
svn path=/nixos/trunk/; revision=20350
2010-03-03 13:22:06 +00:00
Lluís Batlle i Rossell b6090bff9d Making the bootloaders respect the platform.kernelTarget set in nixpkgs.
svn path=/nixos/trunk/; revision=20283
2010-02-27 22:17:10 +00:00
Lluís Batlle i Rossell 9002335101 Making nixos handle the nixpkgs 'platform' parameter.
svn path=/nixos/trunk/; revision=20274
2010-02-27 18:37:12 +00:00
Lluís Batlle i Rossell bc4e159d0e Fixing a terrible bug in nixos nfs-kernel server, related to the exports file.
The file contents were taken as a file path. This resulted in a system with a totally broken /etc:
lrwxrwxrwx 1 root nixbld   51 22 feb 21:45 bashrc -> /nix/store/gh71a6w50cxrl4124kxfn24yi0b7aaka-useradd
lrwxrwxrwx 1 root nixbld   44 22 feb 21:45 nix.conf -> 192.168.1.4(rw,no_root_squash,no_all_squash)
lrwxrwxrwx 1 root nixbld   58 22 feb 21:45 inputrc -> /nix/store/1czhdj7q74dc556frqrh51jyshfsxhl3-bashrc-user.sh
lrwxrwxrwx 1 root nixbld   51 22 feb 21:45 nsswitch.conf -> /nix/store/qsgsli992hd1g8245d8am9izn9xmw90x-inputrc
lrwxrwxrwx 1 root nixbld   20 22 feb 21:45 exports -> /home/sheevaplugroot

Notice that the inputrc has strange contents. In my case, that disabled me to type 's' or 'i' (at least) in any new interactive shell.

If you notice, the 'exports' symlink should point to a store file, which contents had to look like:
/home/sheevaplugroot 192.168.1.4(rw,no_root_squash,no_all_squash)

This patch achieves this later behaviour rather than the former.


svn path=/nixos/trunk/; revision=20181
2010-02-22 21:41:49 +00:00
Eelco Dolstra 0bae6c2c18 * Disable the "smart" tab completion again, because it causes lots of
problems:

  - It doesn't support filenames with spaces.
  - It inserts a space after the filename when tab-completing in an
    "svn" command.
  - Many people find it annoying that tab-completion on commands like
    "tar" only matches filenames with the "right" extension.
  - Lluís reported bash apparently crashing on some tab completions.

  We should probably make this optional, and maybe use a subset of the
  bash_completion file in the bash distribution that works.

svn path=/nixos/trunk/; revision=20179
2010-02-22 17:20:12 +00:00
Eelco Dolstra cc0a2a6944 * Don't say `jobs.foo = mkIf condition { ... }' because that will
create an empty job `foo' if the condition is false.  Instead use
  `jobs = optionalAttrs condition { foo = { ... }; }'.
* Enable portmap automatically when using the NFS server or client.

svn path=/nixos/trunk/; revision=20178
2010-02-22 17:12:26 +00:00
Lluís Batlle i Rossell 0fb8300bb6 Updating the nixos NFS related expressions. Thanks to Oleksandr for the
help.
I tried not to break the tests.


svn path=/nixos/trunk/; revision=20157
2010-02-21 16:26:33 +00:00
Rob Vermaas 2b7da40351 revert unintended part of the previous commit
svn path=/nixos/trunk/; revision=20123
2010-02-19 09:55:28 +00:00
Rob Vermaas a87ee76cb3 * hydra: added option to self manage nix.machines (for buildfarm purposes)
svn path=/nixos/trunk/; revision=20121
2010-02-19 09:48:24 +00:00
Lluís Batlle i Rossell 093b51a562 Removing references to linux kernel 'vmlinuz', and making them point to 'bzImage'.
That should match with a related change in nixpkgs.


svn path=/nixos/trunk/; revision=20095
2010-02-18 11:35:39 +00:00
Rob Vermaas f1438d3d27 tomcat: add option to enable accesslog per virtual host (default: off)
svn path=/nixos/trunk/; revision=20075
2010-02-17 12:32:19 +00:00
Rob Vermaas c17a76279d zabbix agent: extraConfig
svn path=/nixos/trunk/; revision=20048
2010-02-16 12:51:28 +00:00
Eelco Dolstra f013236f1e * Idem for zabbix-agent.
svn path=/nixos/trunk/; revision=20040
2010-02-16 10:15:20 +00:00
Eelco Dolstra 9127795e4a * Make sure that Upstart notices when the Zabbix server crashes so
that it can be restarted.  Zabbix is kind of hard to monitor, so use
  a trick with an open fifo to detect when it goes down.

svn path=/nixos/trunk/; revision=20039
2010-02-16 10:10:59 +00:00
Lluís Batlle i Rossell 1dd3162d7c First attempt at trying to get a tarball of a bootable nixos system.
What I want with this derivation is to allow the sheevaplug nixos to
build a tarball with all the needed files to boot. Then, this can be
unpacked into an SD card, or into a NFS/TFTP server, and then the
user can boot the system with help of the uboot console.
By now, I have only tried to build the tarball in a PC, in order
to develop the nix expressions quicker.

There is nothing written specialy for the Sheevaplug in all this,
by now.


svn path=/nixos/trunk/; revision=20035
2010-02-15 23:27:51 +00:00
Eelco Dolstra 97f30fb17b * The Zabbix agent should start after the hostname is set.
svn path=/nixos/trunk/; revision=20029
2010-02-15 20:34:01 +00:00
Eelco Dolstra cc90f62ceb * Use `psql' with an empty command to check whether PostgreSQL is up
and running.  `pg_ctl status' merely checks whether PostgreSQL is
  running, not whether it is already accepting connections.  This
  causes Upstart jobs that depend on PostgreSQL to fail.

svn path=/nixos/trunk/; revision=20024
2010-02-15 19:29:54 +00:00
Eelco Dolstra 83b76bc2cf * Option `services.apache.phpIni' (which is of type derivation)
replaced by `services.apache.phpOptions' (of type string).
* Allow Apache subservices to add to phpOptions.
* Set the TZ environment variable in Apache.
* Updated the Zabbix web interface.

svn path=/nixos/trunk/; revision=20023
2010-02-15 19:02:42 +00:00
Eelco Dolstra 014ffaac5d * Update the Zabbix agent module.
svn path=/nixos/trunk/; revision=20019
2010-02-15 17:13:43 +00:00
Eelco Dolstra 4253490fd4 svn path=/nixos/trunk/; revision=20016 2010-02-15 15:55:54 +00:00
Ludovic Courtès 5cb934da59 Fix Bash completion support.
svn path=/nixos/trunk/; revision=19971
2010-02-13 00:07:12 +00:00
Eelco Dolstra dbc03fbf68 * nixos-install: copy /etc/nsswitch.conf to the chroot. This seems
necessary to have it use /etc/hosts.

svn path=/nixos/trunk/; revision=19905
2010-02-10 14:31:46 +00:00
Ludovic Courtès b7b1f5d1cc X11: Add a few more basic X clients to `systemPackages'.
svn path=/nixos/trunk/; revision=19902
2010-02-10 13:22:38 +00:00
Eelco Dolstra 07cc5ac2fd * "python2.5" -> ${pkgs.python.libPrefix}
svn path=/nixos/trunk/; revision=19901
2010-02-10 12:39:47 +00:00
Eelco Dolstra 0f56bd755a * Disable bash completion for now. It gives login errors:
bash: BASH_COMPLETION_DIR: readonly variable
    bash: BASH_COMPLETION: readonly variable

  And in the non-interactive shell, we get:

    /nix/store/654xcqk8h2a409mxsnsbnj5c0cp9mjhm-bash-4.1-p2/etc/bash_completion: line 75: shopt: progcomp: invalid shell option name

svn path=/nixos/trunk/; revision=19809
2010-02-04 09:15:46 +00:00
Eelco Dolstra 6a06118f85 * Use the build flags given on the command line while building Nix.
svn path=/nixos/trunk/; revision=19799
2010-02-03 22:49:50 +00:00
Eelco Dolstra 051e9342b3 * Use the moduli file. This shuts up the "WARNING: /etc/ssh/moduli
does not exist, using fixed modulus" message in /var/log/messages.

svn path=/nixos/trunk/; revision=19754
2010-02-01 17:05:02 +00:00
Marco Maggesi 86b42fdfbf Fix bugs and improve modules/services/network-filesystems/openafs-client
svn path=/nixos/trunk/; revision=19751
2010-02-01 16:29:15 +00:00
Eelco Dolstra fc583b7054 * When QEMU encounters a "disk full" condition on the host filesystem,
its default behaviour is to stop the emulator (i.e. suspend the VM).
  For automated tests, this is bad, because is makes the VM appear to
  hang without any error message.  The "werror=report" flag causes
  QEMU to report the problem to the VM.  As a side effect QEMU exits
  very elegantly:

    [    2.308668] end_request: I/O error, dev vda, sector 534400
    [    2.309611] Buffer I/O error on device vda, logical block 66800
    ...
    *** glibc detected *** /nix/store/yhngqrww53j0aw7z7v4bv948x5g5fc3d-qemu-kvm-0.12.1.2/bin/qemu-system-x86_64: double free or corruption (!prev): 0x08e3e040 ***
    Aborted

  So I guess we now depend on a bug in QEMU :-)

svn path=/nixos/trunk/; revision=19703
2010-01-27 10:36:43 +00:00
Eelco Dolstra 0432766399 * Fall back to the kernel modules used at boot time if the modules in
the current configuration don't match the running kernel.  This
  ensures that modprobe still works after a "nixos-rebuild switch" to
  a configuration that has a different kernel version.

svn path=/nixos/trunk/; revision=19696
2010-01-26 21:45:13 +00:00
Eelco Dolstra 442093d27d * grep returns a non-zero exit code if no line matches, causing the
swap task to fail.  So ignore that.

svn path=/nixos/trunk/; revision=19660
2010-01-26 09:56:53 +00:00
Eelco Dolstra 32995b3d36 * Make the AMI disk a bit bigger. Thanks to sparse images and
compression this shouldn't be expensive.

svn path=/nixos/trunk/; revision=19647
2010-01-25 10:40:08 +00:00
Marc Weber aad3d21ceb upstart: quote environment vars. John Altobelli hit the case TZ=New York
svn path=/nixos/trunk/; revision=19633
2010-01-23 22:38:30 +00:00
Ludovic Courtès 06aeb7d87f GNUnet: Add options; add as a system package; provide /etc/gnunetd.conf.
svn path=/nixos/trunk/; revision=19630
2010-01-23 15:47:33 +00:00
Eelco Dolstra cb728f833f svn path=/nixos/trunk/; revision=19624 2010-01-22 21:07:06 +00:00
Eelco Dolstra 50430f19e1 * Only run dhclient on interfaces of type 1, otherwise it fails to
start if the machine has weird network devices (e.g. "eql").

svn path=/nixos/trunk/; revision=19623
2010-01-22 20:34:32 +00:00
Eelco Dolstra 9094ecb546 * Some hacks to get the image to work with newer EC2 kernels/initrds.
svn path=/nixos/trunk/; revision=19622
2010-01-22 20:22:40 +00:00
Eelco Dolstra 12a0a68749 * Initialise the Nix database in the VM.
* Set the hostname at startup.
* Mount the ephemeral data disk (/dev/sda2).


svn path=/nixos/trunk/; revision=19619
2010-01-22 17:31:23 +00:00
Eelco Dolstra 3e3448a7df * Added an Upstart job to fetch the SSH key for logging into the root
account of the VM.  However, it doesn't work yet (the machine
  doesn't boot properly and there is no console output).  So use a
  hard-coded password for now (very dangerous!).

svn path=/nixos/trunk/; revision=19589
2010-01-21 08:03:58 +00:00
Eelco Dolstra 590acc193c * A module for generating a disk image suitable for use with Amazon's
Elastic Compute Cloud (EC2).  TODO: run ec2-bundle-image here.

svn path=/nixos/trunk/; revision=19580
2010-01-20 18:10:02 +00:00
Eelco Dolstra 6d21e00776 * Some hacks to support running NixOS on Amazon EC2 (and other hosting
environment where you don't get to run stage 1 of the boot).

svn path=/nixos/trunk/; revision=19579
2010-01-20 18:06:33 +00:00
Eelco Dolstra 8a6346e477 * Provide a bundle of CA certificates in /etc/ca-bundle.crt, and set
the CURL_CA_BUNDLE environment variable.  This allows curl to work
  without the `-k' flag on https sites with a properly signed
  certificate.

svn path=/nixos/trunk/; revision=19572
2010-01-20 14:22:47 +00:00
Michael Raskin 6502806689 Allow turning off VESA framebuffer
svn path=/nixos/trunk/; revision=19473
2010-01-15 21:55:51 +00:00
Lluís Batlle i Rossell 8d5037ad62 network-interfaces and emitting ip-up: I was still learning boolean logic.
svn path=/nixos/trunk/; revision=19464
2010-01-15 11:20:57 +00:00
Lluís Batlle i Rossell 13ee735395 Making nixos work well with the new names 'linuxPackages' in stdenv-updates, additionally
to the nixpkgs trunk 'kernelPackages'.
Seeing a strange kernelPackages mentioned in installation-cd-rescue (2.6.31_something) I
update that to 2.6.32.


svn path=/nixos/trunk/; revision=19443
2010-01-14 19:50:49 +00:00
Eelco Dolstra f89e46bc12 * Revert r19339 because it doesn't work and gives a lot of errors:
client# /dev/fd/9: line 13: -q: command not found
client# /dev/fd/9: line 18: test: -neq: binary operator expected
client# mdadm: No arrays found in config file

svn path=/nixos/trunk/; revision=19386
2010-01-13 10:37:58 +00:00
Lluís Batlle i Rossell b5ade01199 Make network-interfaces emit the ip-up if there are interfaces defined *OR*
there are localCommands (which potentially can bring up interfaces).


svn path=/nixos/trunk/; revision=19371
2010-01-12 11:08:27 +00:00
Ludovic Courtès c68f5fbae4 Add support for pam_limits.
svn path=/nixos/trunk/; revision=19370
2010-01-12 11:02:23 +00:00
Lluís Batlle i Rossell d45a3fbdc9 Adding the pcscd daemon (this daemon manages smartcard reader drivers), and offers
a common interface to programs dealing with smartcards (like users of the opensc lib).


svn path=/nixos/trunk/; revision=19360
2010-01-11 21:56:01 +00:00
Eelco Dolstra ee005424bf * Doh, subtle race condition: STARTUP must be cleared after "udevadm
settle".  Otherwise some rules may be processed with STARTUP
  cleared, causing LVM devices not to be created.

svn path=/nixos/trunk/; revision=19341
2010-01-10 20:08:35 +00:00
Eelco Dolstra eccddb67fa * --mknodes is no longer needed (in fact it might interfere with
udev).

svn path=/nixos/trunk/; revision=19340
2010-01-10 20:07:23 +00:00
Nicolas Pierron b02cf8d20e Check that 'mdadm --assemble' is effective before continuing.
svn path=/nixos/trunk/; revision=19339
2010-01-10 19:36:53 +00:00
Eelco Dolstra cac502e35b * Okay, so we do need an "lvm" task to run vgscan/vgchange. It's only
needed though for devices that were not already found and activated
  in the initrd.

svn path=/nixos/trunk/; revision=19337
2010-01-10 19:14:42 +00:00
Eelco Dolstra ac8a2ae577 * Use the LVM udev rules in stage 1. This makes
/dev/disk/by-{label,uuid} paths available for LVM volumes.

svn path=/nixos/trunk/; revision=19334
2010-01-10 19:00:29 +00:00
Eelco Dolstra 5c66611f3e svn path=/nixos/trunk/; revision=19333 2010-01-10 18:34:32 +00:00
Eelco Dolstra cf06d2b9cf * Don't start the filesystems task on a startup event. It's pointless
to do so until udev has created device nodes.

svn path=/nixos/trunk/; revision=19332
2010-01-10 18:23:13 +00:00
Eelco Dolstra e50a7e5f32 * Removed the boot.initrd.lvm option for simplicity.
svn path=/nixos/trunk/; revision=19330
2010-01-10 16:32:30 +00:00
Eelco Dolstra 1a0bb65901 * Added a regression test for whether the Nixpkgs channel works. This
is done by instantiating a webserver that simulates nixos.org.
  Using nix-push we create a channel that contains some stuff (namely
  the GNU Hello source tarball and the rlwrap program).  This was a
  bit tricky because nix-push requires a writable Nix store.  Using
  AUFS this is possible, but not on recent Linux kernels (AUFS1 over
  CIFS fails).

svn path=/nixos/trunk/; revision=19327
2010-01-10 01:26:01 +00:00
Eelco Dolstra 79add5ecbc * Make the Nix store in the guest writable.
svn path=/nixos/trunk/; revision=19326
2010-01-10 01:20:30 +00:00
Eelco Dolstra 39796e26b4 * Removed the boot.isLiveCD option. Moved the code for mounting a
tmpfs on top of the CD to iso-image.nix.

svn path=/nixos/trunk/; revision=19318
2010-01-09 15:13:06 +00:00
Lluís Batlle i Rossell b59cfde311 Making /dev/pts files have group owner 'tty', so 'mesg y' will work.
svn path=/nixos/trunk/; revision=19317
2010-01-09 14:23:20 +00:00
Eelco Dolstra 6f8a3ba7c7 * Create devicemapper/lvm device nodes from udev (using the rules
supplied by the lvm package).  This makes the "lvm" Upstart task
  unnecessary.  Also, we now get /dev/disk/by-{label,uuid} symlinks
  for LVM logical disks.

svn path=/nixos/trunk/; revision=19300
2010-01-07 22:39:35 +00:00
Lluís Batlle i Rossell fa2a6f835f Adding wicd, taking in the patch sent by roconnor to nix-dev on 2010-01-07.
svn path=/nixos/trunk/; revision=19298
2010-01-07 17:53:03 +00:00
Eelco Dolstra 0595b7f89d * devicemapper -> lvm2.
svn path=/nixos/trunk/; revision=19294
2010-01-07 16:14:50 +00:00
Eelco Dolstra 9a0789a81e * Add devicemapper to the system path.
svn path=/nixos/trunk/; revision=19292
2010-01-07 15:55:05 +00:00
Eelco Dolstra 34341d810a * Remove a debug line.
svn path=/nixos/trunk/; revision=19285
2010-01-07 13:53:09 +00:00
Marc Weber fdc63c54e4 enhance phpIni documentation
readd r19267 (the issue should be fixed now)

Eelco Dolstra and Nicolas Pierron both kept asking me to pay attention
to the rendered manual. There is one catch: example settings such as
pkgs.kernelPackages_2_6_25 are correct however they don't render
properly. Moreover you don't want those examples to be evaluated (maybe
compiling a kernel ?) when building the manual only.
So use Strings and add a copy & paste note.
This is still a hacky. Maybe a kind of typed "verbatim" expression
should be added (?)

svn path=/nixos/trunk/; revision=19281
2010-01-07 09:01:40 +00:00
Eelco Dolstra ac7c404deb * Revert r19267 - it causes a corrupt Apache Upstart job to be
generated.  E.g. in
  http://hydra.nixos.org/build/208321/nixlog/8/raw:

    webserver# init:/etc/init/httpd.conf:14: Unexpected token

svn path=/nixos/trunk/; revision=19280
2010-01-06 23:37:30 +00:00
Eelco Dolstra ed7d096624 * Resolve $device (e.g. from /dev/disk/by-label/foo -> /dev/sda2),
because /proc/swaps contains resolved paths as well.  Without this,
  the swap device will be turned off again by the $unused code.

svn path=/nixos/trunk/; revision=19278
2010-01-06 22:41:59 +00:00
Eelco Dolstra ec3398e4b2 * Move the serial console kernel parameters to test-instrumentation.nix.
svn path=/nixos/trunk/; revision=19275
2010-01-06 21:16:57 +00:00
Eelco Dolstra 83478a0800 * Add klibc and klibcShrunk to the CD because they're always needed
during an installation.

svn path=/nixos/trunk/; revision=19273
2010-01-06 20:51:10 +00:00
Eelco Dolstra 8ebde1ea8a * Add the modules for all block devices.
svn path=/nixos/trunk/; revision=19271
2010-01-06 20:09:53 +00:00
Eelco Dolstra bb236f99de * Urgh, socat ignores SIGCHLD, which causes Nix builds to fail.
svn path=/nixos/trunk/; revision=19270
2010-01-06 18:03:31 +00:00
Marc Weber 99644df67a customizable PHPRC
svn path=/nixos/trunk/; revision=19267
2010-01-06 17:05:57 +00:00
Eelco Dolstra 1b21115f61 * Support creating a virtual disk in the test driver.
svn path=/nixos/trunk/; revision=19263
2010-01-06 14:37:23 +00:00
Eelco Dolstra 1da72333d9 * Put the NixOS boot at the top so that it's the default.
svn path=/nixos/trunk/; revision=19255
2010-01-06 12:24:20 +00:00
Eelco Dolstra c9e4b46d48 * Ugly hack: for CIFS mounts, retry the mount a few times (just as in
pkgs/build-support/vm).  This should make the NixOS regression tests
  more robust on heavily loaded systems, where they now frequently
  fail:

  server# mounting //10.0.2.4/qemu on /hostfs...
  server# [    8.233991] Slow work thread pool: Starting up
  server# [    8.234721] Slow work thread pool: Ready
  server# [   23.271708]  CIFS VFS: No response for cmd 114 mid 1
  server# [   23.272443]  CIFS VFS: cifs_mount failed w/return code = -112
  server# mount: Host is down
  server# [   23.275188] Kernel panic - not syncing: Attempted to kill init!

  Maybe there is a configurable timeout somewhere, which would be much
  nicer...

svn path=/nixos/trunk/; revision=19248
2010-01-06 00:25:14 +00:00
Eelco Dolstra bc68c2985c * Added a function waitForX, which returns when the X server accepts
connections.
* In the root shell, source /etc/bashrc and set $HOME and $DISPLAY.  

svn path=/nixos/trunk/; revision=19247
2010-01-05 23:59:29 +00:00
Eelco Dolstra 5cc99487cb * A function to wait until a window exists.
svn path=/nixos/trunk/; revision=19246
2010-01-05 23:38:13 +00:00
Eelco Dolstra 73668f41da * Added an "auto" pseudo display manager that logs in a user
automatically.  This is mostly useful for testing.  (KDM also has
  this feature, but it's nice not to depend on KDE for non-KDE tests.)

svn path=/nixos/trunk/; revision=19239
2010-01-05 15:32:14 +00:00
Eelco Dolstra 62476f2816 * Added a module for IceWM.
svn path=/nixos/trunk/; revision=19238
2010-01-05 15:30:56 +00:00
Eelco Dolstra 9889d9f9f8 * Remove most default kernel options since they have no effect. Also,
don't put them in a default, so that they can easily be added to.

svn path=/nixos/trunk/; revision=19232
2010-01-05 13:11:12 +00:00
Eelco Dolstra 7541141a7a * Send stderr to /dev/ttyS0 (so that it doesn't pollute the socket
connection).

svn path=/nixos/trunk/; revision=19226
2010-01-05 11:42:08 +00:00
Eelco Dolstra 170331be30 * Don't use /hostfs to signal the test driver that a VM is up, but
write some magic string to ttyS0.  This removes the dependency on
  having a CIFS mount.
* Use a thread to process the stdout/stderr of each QEMU instance.
* Add a kernel command line parameter "stage1panic" to tell stage 1 to
  panic if an error occurs.  This is faster than waiting until
  connect() times out.

svn path=/nixos/trunk/; revision=19212
2010-01-04 18:04:57 +00:00
Eelco Dolstra 9aa0a336bc * Updated the coverage analysis handling for Linux 2.6.32. Gcov is
now merged in the kernel, and the gcda files are exported through
  debugfs in /sys/kernel/debug/gcov.

svn path=/nixos/trunk/; revision=19207
2010-01-04 13:22:43 +00:00
Eelco Dolstra 13878cb78d * Panic on out-of-memory.
svn path=/nixos/trunk/; revision=19200
2010-01-04 09:51:57 +00:00
Eelco Dolstra 790368e315 * Removed installation-cd-minimal-fresh-kernel.nix since the kernel in
installation-cd-minimal.nix is now 2.6.32.  Added most of its extra
  tools to installation-cd-base.nix.
* Put memtest86 at the bottom of the GRUB menu.  (There is currently
  no good way to do this other than to change the module inclusion
  order.)

svn path=/nixos/trunk/; revision=19188
2010-01-03 17:13:30 +00:00
Eelco Dolstra 21216b0461 * Move some kernel modules around.
svn path=/nixos/trunk/; revision=19187
2010-01-03 16:29:17 +00:00
Marc Weber 4378018164 nixos-rebuild: allow passing --fallback
replacing if .. fi by case .. esac

svn path=/nixos/trunk/; revision=19186
2010-01-03 13:36:23 +00:00
Nicolas Pierron d2901e979d * Add support for pam_usb.
svn path=/nixos/trunk/; revision=19185
2010-01-03 11:59:08 +00:00
Eelco Dolstra 64c75274e1 * Use Linux 2.6.32 on the installation CD.
svn path=/nixos/trunk/; revision=19166
2010-01-01 16:26:01 +00:00
Nicolas Pierron 81d621b4f7 * Replace blowfish by AES, since recent CPU could have optimisation for it.
* Miss-interpretation of the --skip option of cryptsetup.  Ciphered partition labels are not supported.  Labels are erased when doing mkswap on the ciphered partition.
* Avoid doing swapon on devices which are already listed in /proc/swaps.
* Remove no longer listed devices with only one swapoff command.

svn path=/nixos/trunk/; revision=19164
2009-12-31 13:56:47 +00:00
Sander van der Burg df21f0f06d Made a small fix because I kept receiving errors about: diff command not found. It also makes my system horribly slow.
svn path=/nixos/trunk/; revision=19148
2009-12-29 21:23:22 +00:00
Nicolas Pierron 4cf78fdb77 * Use postStart instead of preStart.
* Assemble devices only if there is a new entry.
* Add 'new-raid-array' flag to assemble new arrays.
* Emit new-devices flag to triggers the 'filesystems' task.

svn path=/nixos/trunk/; revision=19145
2009-12-29 14:10:05 +00:00
Nicolas Pierron e70214c853 Remove loop of new-device messages. Add a shell script to watch new devices.
svn path=/nixos/trunk/; revision=19142
2009-12-29 10:04:54 +00:00
Nicolas Pierron 246dae96fe Add an option to cipher swap partitions.
! Not tested yet: cryptsetup depends on a missing
! udev binary.

svn path=/nixos/trunk/; revision=19131
2009-12-26 16:20:00 +00:00
Marc Weber c0c4d575d2 autofs job fixes:
use exec so that upstart knows when automount shuts down.
If a mount is used upstart will send SIGKILL.
Automount doesn't clean up. So unmount everything using a post script.

svn path=/nixos/trunk/; revision=19105
2009-12-25 06:39:43 +00:00
Lluís Batlle i Rossell aaac043ae5 Making an explicit dependency for nfs-kernel on portmap
svn path=/nixos/trunk/; revision=19090
2009-12-24 12:05:34 +00:00
Eelco Dolstra 9c465fedfa * Reinstate the -s flag.
svn path=/nixos/trunk/; revision=19055
2009-12-20 22:03:32 +00:00
Eelco Dolstra 57f70db611 * Revert r19003 for now, because wpa_supplicant 0.6.9 (in the Nixpkgs
trunk) doesn't have a -s flag.  0.7.0 in the stdenv branch
  presumably does, but it's marked as unstable upstream.

svn path=/nixos/trunk/; revision=19047
2009-12-20 16:51:22 +00:00
Marc Weber 93cb9f819d cosmetic: remove redundancy
svn path=/nixos/trunk/; revision=19040
2009-12-18 15:08:50 +00:00
Eelco Dolstra 01491abbfa * Handle the case where initScriptBuilder is not set.
svn path=/nixos/trunk/; revision=19014
2009-12-17 12:35:58 +00:00
Eelco Dolstra 44dafe885b * Don't enable this by default.
svn path=/nixos/trunk/; revision=19012
2009-12-17 11:43:12 +00:00
Marc Weber 4ff6821a03 module creating /sbin/init
svn path=/nixos/trunk/; revision=19009
2009-12-17 06:04:36 +00:00
Lluís Batlle i Rossell 483ee6219e Fixing the shutdown script, for the not-that-strange case of having
/nix bind mounted from a fs not rootfs.

As niksnut found, if the sources of bind mounted directories are
umounted before remounting them as "ro", a "mount -o remount,ro" on the
bind targets will not leave the filesystem properly umounted, the same
way as a "-o remount,ro" would do on a usual filesystem.

So, the trick of always remounting as 'ro' before attempting an umount seems
to fix the problem.

svn path=/nixos/trunk/; revision=19008
2009-12-16 23:59:05 +00:00
Eelco Dolstra aa445933a7 * Include some more firmware in the installation CD.
svn path=/nixos/trunk/; revision=19007
2009-12-16 23:52:02 +00:00
Lluís Batlle i Rossell eea026d321 Enabling back the i8042 module loading at initrd. Otherwise, some
may not get any keyboard driver loaded (as I experienced).

svn path=/nixos/trunk/; revision=19006
2009-12-16 23:45:10 +00:00
Lluís Batlle i Rossell 3f6ca96967 Adding an option to disable nscd.
svn path=/nixos/trunk/; revision=19004
2009-12-16 20:51:25 +00:00
Lluís Batlle i Rossell ee434cc3d6 Using wpa_supplicant feature to log to syslog, instead of stdout (which,
in the actual upstart job, meant /dev/console)

svn path=/nixos/trunk/; revision=19003
2009-12-16 19:45:19 +00:00
Lluís Batlle i Rossell 4e8270f695 Upstart considers that syslog is ready (runs openlog())
after the connection to dbus worked.
So I set dbus depend also on syslogd.

svn path=/nixos/trunk/; revision=19002
2009-12-16 19:45:11 +00:00
Eelco Dolstra 0ca7619e62 svn path=/nixos/trunk/; revision=18999 2009-12-16 18:58:34 +00:00
Eelco Dolstra deb4f88c2c * Let the GRUB menu builder detect whether /boot is on a different
partition from /.  If so, copy the kernels and initrds to /boot and
  use paths relative to /boot in the GRUB configuration file.  This
  makes the boot.loader.grub.bootDevice option obsolete.  (Is there a
  way to mark obsolete options?)  It also makes it unnecessary to set
  boot.loader.grub.copyKernels, although that option is still
  available since it can speed up GRUB if the Nix store is very
  large.

svn path=/nixos/trunk/; revision=18998
2009-12-16 18:57:02 +00:00
Eelco Dolstra 8d588424d2 * switch-to-configuration: force a reinstallation of GRUB whenever the
GRUB version changes.  (That's the complete version from the name
  attribute, not the boot.loader.grub.version attribute.)  The current
  version is recorded in /boot/grub/version.  This is required to
  prevent massive breakage when we change the default value of
  boot.loader.grub.version to "2".

svn path=/nixos/trunk/; revision=18997
2009-12-16 18:11:26 +00:00
Rob Vermaas 48d5ea1077 mysql.mysql becomes mysql.package because eelco likes it better
svn path=/nixos/trunk/; revision=18994
2009-12-16 15:24:15 +00:00
Rob Vermaas 52284859c5 * allow configuration of mysql version
svn path=/nixos/trunk/; revision=18993
2009-12-16 14:54:36 +00:00
Eelco Dolstra 0d095de38a * Revert r18985, but now handle the case where a nixbld user doesn't
exist yet.  Ludo's original patch only worked in the "update" case.
  Also, do this only for the nixbld group.

svn path=/nixos/trunk/; revision=18990
2009-12-16 13:35:03 +00:00
Marc Weber 6c30ba3e48 fix nix-build trouble after fresh install:
problem:
Nix only recognizes nixbld users which have nixbld set in extraGroups.
After installation the user was created by activate with group='nixbld'
and extraGroups=[]
After rebooting a conditional shell script fixed this by adding
extraGroups=["nixbld"].

This patches creates the user they way it was in the past with
group='nobody' and extraGroups=["nixbld"].

Another solution would be making nix be aware of the primary group as
well. However this would require everyone to update Nix after updating
NixOS.

svn path=/nixos/trunk/; revision=18985
2009-12-16 04:55:31 +00:00
Marc Weber 181f4bee26 fix nixos-intall(2). Now the configuration is built correctly.
Passing --arg configuration does no longer work!

svn path=/nixos/trunk/; revision=18983
2009-12-15 23:26:55 +00:00
Marc Weber 4b5864666e * refactoring kvm test and bootstrapping image.
expose makeInfo (used by test now)
  expose config hack
* Adding tests to release.nix
* fixes
* removing dependency on perl

refactoring details:
Move all configuration modules used by the NixOS installation test script
into one directory.

svn path=/nixos/trunk/; revision=18982
2009-12-15 23:26:52 +00:00
Eelco Dolstra 79bcc7618e * Make the graphical boot work on GRUB 2 in the case where /nix/store
is not on the same partition as /boot (i.e. when
  boot.loader.grub.bootDevice is set): just copy the background image
  and the font to /boot.

svn path=/nixos/trunk/; revision=18979
2009-12-15 21:11:39 +00:00
Lluís Batlle i Rossell 79073c7b3d Adding a virtualisation option: run qemu without graphics.
svn path=/nixos/trunk/; revision=18978
2009-12-15 18:49:34 +00:00
Eelco Dolstra daa814980e * At the end of stage 1, reset /proc/sys/kernel/modprobe to
/sbin/modprobe because the sactivation script in stage 2 expects it
  to be so.

svn path=/nixos/trunk/; revision=18977
2009-12-15 18:31:21 +00:00
Eelco Dolstra cea70d24e9 * The default default menu item (sic) should be 0, not 1. (Or is this
different for GRUB 2?)
* Clean up the option descriptions.

svn path=/nixos/trunk/; revision=18976
2009-12-15 18:21:55 +00:00
Eelco Dolstra 6c9059e717 * Added an option `boot.initrd.availableKernelModules' that specifies
modules that should be added to the initrd, but should only be
  loaded on demand (e.g. by the kernel or by udev).  This is
  especially useful in the installation CD, where we now only load the
  modules needed by the hardware.
* Enable automatic modprobing by udev in the initrd.

svn path=/nixos/trunk/; revision=18975
2009-12-15 16:38:20 +00:00
Eelco Dolstra e8372257a1 * Reformat.
svn path=/nixos/trunk/; revision=18970
2009-12-15 14:10:06 +00:00
Eelco Dolstra a612fd0d5e * Obsoleted boot.initrd.extraKernelModules (use
boot.initrd.kernelModules instead).

svn path=/nixos/trunk/; revision=18969
2009-12-15 14:05:01 +00:00
Michael Raskin b628ca221d Fix Monit upstart dependency
svn path=/nixos/trunk/; revision=18964
2009-12-15 13:32:10 +00:00
Eelco Dolstra d6108919b1 * The loopback device is in a module now. Since it's not
automatically loaded by the kernel, load it at boot time.
* Put the ext2 module (which used to be built in) in the initrd to
  prevent unexpected breakage.

svn path=/nixos/trunk/; revision=18963
2009-12-15 13:09:06 +00:00
Ludovic Courtès 3f2348ef91 Start networking services on `ip-up' when it makes sense.
svn path=/nixos/trunk/; revision=18962
2009-12-15 13:02:23 +00:00
Marc Weber 401fd84ae1 kvm installation test update + NixOS installation archive
You can run the kvm nixos installation test by:
  nix-build --no-out-link tests/test-nixos-install-from-cd.nix
It boots the installed system.
It still fails sshd isn't started (yet)

adding nixos-bootstrapping-archive:
You can install NixOS easily using any live cd now.
See README-BOOTSTRAP-NIXOS

svn path=/nixos/trunk/; revision=18950
2009-12-15 06:37:32 +00:00
Rob Vermaas fe490f2edc * mysql-backup: option for which user to use for performing backups
svn path=/nixos/trunk/; revision=18942
2009-12-14 17:57:37 +00:00
Rob Vermaas 1dfab1d7ea * virtualisation.memorySize option to set memory size of virtual machine
svn path=/nixos/trunk/; revision=18933
2009-12-14 11:15:37 +00:00
Ludovic Courtès 83d657b102 Change the Nix build users to have no supplementary group.
For details, see:
http://thread.gmane.org/gmane.linux.distributions.nixos/3264
http://thread.gmane.org/gmane.linux.distributions.nixos/3263/focus=3289

svn path=/nixos/trunk/; revision=18918
2009-12-13 15:29:42 +00:00
Marc Weber 4d7e344f69 Adding initial version of the nixos cd insallation test script using
qemu_kvm. Installation doesn't take place yet. VM is started
printing a remote controlled "Hello".

This serves as example how to run a vm within a bulid job.

svn path=/nixos/trunk/; revision=18887
2009-12-11 00:51:13 +00:00
Marc Weber 086c3d6328 making default and timeout of grub overridable
also updating grub option names to current names

svn path=/nixos/trunk/; revision=18886
2009-12-11 00:51:07 +00:00
Rob Vermaas 038180bab8 * sshd.nix: ports attribute, to allow listening to multiple ports
svn path=/nixos/trunk/; revision=18877
2009-12-10 14:45:41 +00:00
Eelco Dolstra 9682f0ed90 svn path=/nixos/trunk/; revision=18872 2009-12-10 09:22:45 +00:00
Lluís Batlle i Rossell 60b856b115 Adding a module for system health monitoring (getting graphs generated by rrdtool
of usual system counters).
It sets up some cron jobs for collecting the data, and not that often, generating the
graphs. Then the httpd server is configured with a directory with the generated
static files.

http://www.brianlane.com/software/systemhealth/

svn path=/nixos/trunk/; revision=18866
2009-12-09 21:45:59 +00:00
Lluís Batlle i Rossell b005e22952 Adding a not-very-nice option to allow setting the wpa_supplicant interface.
(eth1 in my PC, instead of the previously hardcoded wlan0)

svn path=/nixos/trunk/; revision=18862
2009-12-09 20:30:40 +00:00
Eelco Dolstra 38aeb2fdc8 svn path=/nixos/trunk/; revision=18860 2009-12-09 19:35:59 +00:00
Eelco Dolstra f26080c5f4 * Clean up the nixos-rebuild output a bit.
svn path=/nixos/trunk/; revision=18859
2009-12-09 18:23:48 +00:00
Rob Vermaas ed6d8c6881 due to new upstart version, vm tests didn't work anymore
svn path=/nixos/trunk/; revision=18840
2009-12-08 11:41:21 +00:00
Nicolas Pierron 82a891dc46 Add support for require attributes inside children configurations.
svn path=/nixos/trunk/; revision=18820
2009-12-05 19:21:57 +00:00
Nicolas Pierron 05c23802bb Fix synergy client.
* Add serverAddress option.
* Evaluate the client daemon in foreground, otherwise upstart get the hand
  and tries to restart it.

svn path=/nixos/trunk/; revision=18799
2009-12-04 12:50:49 +00:00
Nicolas Pierron f4a6f9e84b * Add options to handle automatic calls to the garbage collector.
These options avoid manual references to pkgs.nixUnstable which might be
  changed with environment.nix option.

svn path=/nixos/trunk/; revision=18798
2009-12-04 12:50:44 +00:00
Eelco Dolstra 4eabed3f0f * Support short URLs (http://server/wiki/Page instead of
http://server/w/index.php?title=Page).

svn path=/nixos/trunk/; revision=18783
2009-12-03 13:34:36 +00:00
Eelco Dolstra aacd16cff0 * Make various MediaWiki scripts available in $PATH,
e.g. mediawiki-<id>-changePassword (where <id> is usually "main").

svn path=/nixos/trunk/; revision=18780
2009-12-03 12:20:24 +00:00
Eelco Dolstra 9f8fc09fc3 * Create a user "mediawiki" and give root and wwwrun ident-based
access.

svn path=/nixos/trunk/; revision=18779
2009-12-03 11:56:03 +00:00
Eelco Dolstra c7e0a7b31c * Make it configurable.
svn path=/nixos/trunk/; revision=18778
2009-12-03 08:44:54 +00:00
Eelco Dolstra 81c3454cdb * Allow Mediawiki (and other PHP applications) to send email through
the `sendmail' command (i.e. ssmtp).  This is hacky - there should
  be some global config value that specifies the path to sendmail,
  which the ssmtp module and others can then set.

svn path=/nixos/trunk/; revision=18777
2009-12-03 08:25:16 +00:00
Eelco Dolstra f99d9b0658 * Basic MediaWiki module. Thanks to Dario Vodopivec, Milan Seneši and
Nasir Shadravan.

svn path=/nixos/trunk/; revision=18769
2009-12-02 17:59:17 +00:00
Eelco Dolstra d29072d214 * Generate a postgresql.conf and use it to specify the paths to
pg_hba.conf and pg_ident.conf.
* Turn on syslog logging for PostgreSQL.

svn path=/nixos/trunk/; revision=18768
2009-12-02 17:18:25 +00:00
Marco Maggesi 729bf2e2f0 Fix wrong upstart directives in openafs-client
svn path=/nixos/trunk/; revision=18645
2009-11-26 14:12:19 +00:00
Marco Maggesi 7cefe762db Fix openafs-client for the new Upstart 0.6
svn path=/nixos/trunk/; revision=18644
2009-11-26 13:11:56 +00:00
Eelco Dolstra 8e8b3f9313 * Mount /var/run/nscd only once.
svn path=/nixos/branches/upstart-0.6/; revision=18607
2009-11-24 17:25:35 +00:00
Eelco Dolstra ed6daf4ea4 * Doh! I lost ${flags} somewhere along the way, so Postgres
wouldn't get the -i option anymore...

svn path=/nixos/branches/upstart-0.6/; revision=18606
2009-11-24 17:07:23 +00:00
Eelco Dolstra a21f18e81f * Synced with the trunk.
svn path=/nixos/branches/upstart-0.6/; revision=18602
2009-11-24 16:11:01 +00:00
Eelco Dolstra e76f14714b svn path=/nixos/trunk/; revision=18599 2009-11-24 15:05:08 +00:00
Eelco Dolstra 88b26c47ad * Run cronjobs with a more userfriendly $PATH.
svn path=/nixos/trunk/; revision=18595
2009-11-24 14:20:33 +00:00
Sander van der Burg ff177a01a7 Fixed ejabberd service so that it will be started on startup
svn path=/nixos/branches/upstart-0.6/; revision=18557
2009-11-23 13:29:47 +00:00
Sander van der Burg 7fc40ca2f1 Enabled startOn event of the MySQL and Tomcat server so that they are initialised on startup
svn path=/nixos/branches/upstart-0.6/; revision=18556
2009-11-23 13:26:33 +00:00
Michael Raskin 69a2842d01 Switch off one of the two conflicting on-by-default options
svn path=/nixos/trunk/; revision=18519
2009-11-22 14:34:53 +00:00
Ludovic Courtès 1966f9d297 Hopefully really fix the OpenSSH/GnuPG agent assertion (yes!).
svn path=/nixos/trunk/; revision=18517
2009-11-22 00:54:01 +00:00
Ludovic Courtès d912b510f5 Hopefully really fix the OpenSSH/GnuPG agent assertion.
svn path=/nixos/trunk/; revision=18516
2009-11-22 00:46:37 +00:00
Ludovic Courtès ab3332a2eb Rename startSSHAgent' to startOpenSSHAgent'.
svn path=/nixos/trunk/; revision=18515
2009-11-22 00:40:53 +00:00
Ludovic Courtès 8c349a9e71 Fix the OpenSSH/GnuPG agent assertion.
svn path=/nixos/trunk/; revision=18514
2009-11-22 00:40:48 +00:00
Ludovic Courtès 66d8af6d09 X: Add support for starting the GnuPG agent.
svn path=/nixos/trunk/; revision=18509
2009-11-21 22:14:01 +00:00
Sander van der Burg 2c8d2c2268 Small bugfix which automatically creates tomcat configuration dirs. Otherwise the startup would fail
svn path=/nixos/branches/upstart-0.6/; revision=18488
2009-11-20 16:20:57 +00:00
Sander van der Burg ebbde6f8d3 Added directory option for ejabberd dumps so that we can use derivations on a convenient way, e.g. loadDumps = [ myDumpDrvFun ];
svn path=/nixos/branches/upstart-0.6/; revision=18487
2009-11-20 15:35:01 +00:00
Sander van der Burg dd0f8b36d5 Moved ejabberd initialization check loop inside the if statement, since we only have to check for it in the first startup
svn path=/nixos/branches/upstart-0.6/; revision=18464
2009-11-19 15:17:04 +00:00
Sander van der Burg 9b000b3dcf Added loadDumps option, which makes it possible to load a specific ejabberd configuration on the first startup
svn path=/nixos/branches/upstart-0.6/; revision=18461
2009-11-19 15:12:05 +00:00
Sander van der Burg a5cdfcbdb2 Removed the dirty sleep hack from the ejabberd service
svn path=/nixos/branches/upstart-0.6/; revision=18456
2009-11-19 13:15:15 +00:00
Sander van der Burg e171b6d86e Added option to specify directories as a path for MySQL database schemas.
By using this approach we no longer have to specify schemas like this:

schema = "${myDatabaseSchemaDrvFun}/prefix/to/the/sqlfile.sql";

but like this:

schema = myDataBaseSchemaDrv;

which is in some cases more convenient.


svn path=/nixos/branches/upstart-0.6/; revision=18450
2009-11-18 21:56:47 +00:00
Sander van der Burg 27d0d2927e Added initialDatabases option to the MySQL service. This is useful for e.g. automatically intialing databases in a test VM
svn path=/nixos/branches/upstart-0.6/; revision=18437
2009-11-18 16:19:04 +00:00
Michael Raskin ea2417ac87 Apply Eelco Dolstra's formatting suggestions
svn path=/nixos/trunk/; revision=18436
2009-11-18 15:11:54 +00:00
Michael Raskin 26f83d65e4 Adding GVPE service
svn path=/nixos/trunk/; revision=18431
2009-11-18 14:54:37 +00:00
Sander van der Burg 6d11d63ba3 Removed the nasty sleep hack of tomcat, since upstart-0,6 is also capable of only executing start and stop scripts
svn path=/nixos/branches/upstart-0.6/; revision=18430
2009-11-18 14:50:48 +00:00
Marco Maggesi 58b3476dfc Automatic download of CellServDB for OpenAFS client.
svn path=/nixos/trunk/; revision=18417
2009-11-18 13:28:16 +00:00
Eelco Dolstra aa9d0a067e * Sync with the trunk.
svn path=/nixos/branches/upstart-0.6/; revision=18408
2009-11-18 11:50:06 +00:00
Michael Raskin ddc5a7d7c5 Oops, placed mkIf in the wrong place. Fixing
svn path=/nixos/trunk/; revision=18402
2009-11-18 09:30:38 +00:00
Michael Raskin a94da97354 Make monit actually switchable off
svn path=/nixos/trunk/; revision=18401
2009-11-18 09:29:43 +00:00
Michael Raskin 1a05efa66a Adding Monit - one more service to watch system..
svn path=/nixos/trunk/; revision=18399
2009-11-18 08:39:10 +00:00
Michael Raskin f9958cbb44 Update kernel version for fresh-kernel
svn path=/nixos/trunk/; revision=18379
2009-11-17 09:00:49 +00:00
Eelco Dolstra e9b2ef9fb7 * Restart wpa_supplicant and dhclient on resume.
svn path=/nixos/branches/upstart-0.6/; revision=18360
2009-11-15 20:40:41 +00:00
Eelco Dolstra 0755e228bf * Since "initctl stop" is now synchronous, the sleep is no longer
needed.

svn path=/nixos/branches/upstart-0.6/; revision=18359
2009-11-15 20:40:07 +00:00
Eelco Dolstra 56d817b0b0 * X server: remove the udev hack.
svn path=/nixos/branches/upstart-0.6/; revision=18358
2009-11-15 20:38:19 +00:00
Eelco Dolstra 9174b4ab42 * Provide a convience option for commands that must be executed both
when the system boots and when it resumes from suspend.

svn path=/nixos/branches/upstart-0.6/; revision=18354
2009-11-15 12:56:40 +00:00
Eelco Dolstra 1affc9168e * Move power management configuration into a separate module from
the acpid service.
* Add a pm-utils hook to allow commands to be executed when the system
  suspends/resumes etc.

svn path=/nixos/branches/upstart-0.6/; revision=18353
2009-11-15 12:48:42 +00:00