3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

836 commits

Author SHA1 Message Date
Eelco Dolstra ca1910e4b0 * Seems that we don't need the aufs2 mount helper.
svn path=/nixos/trunk/; revision=22038
2010-05-28 09:35:24 +00:00
Eelco Dolstra f9f224972a * Use AUFS2.
svn path=/nixos/trunk/; revision=22033
2010-05-28 07:09:34 +00:00
Yury G. Kudryashov 32d41f439d Remove KDE3 desktop
We have no full KDE3 desktop anyway. KDE3 desktop was broken for a while, and nobody noticed.

svn path=/nixos/trunk/; revision=21996
2010-05-27 09:35:36 +00:00
Eelco Dolstra fa183e5472 * Expose networking.interfaces as an attribute set keyed on the
interface name through the derived option networking.ifaces.  This
  makes it easier to get information about specific interfaces
  (e.g. `nodes.router.config.networking.ifaces.eth2.ipAddress').
  Really networking.interfaces should be an attribute set.

svn path=/nixos/trunk/; revision=21938
2010-05-21 14:12:03 +00:00
Eelco Dolstra 4dac9e5814 * Allow more complex network topologies in distributed tests. Each
machine can now declare an option `virtualisation.vlans' that causes
  it to have network interfaces connected to each listed virtual
  network.  For instance,

    virtualisation.vlans = [ 1 2 ];

  causes the machine to have two interfaces (in addition to eth0, used
  by the test driver to control the machine): eth1 connected to
  network 1 with IP address 192.168.1.<i>, and eth2 connected to
  network 2 with address 192.168.2.<i> (where <i> is the index of the
  machine in the `nodes' attribute set).  On the other hand,
  
    virtualisation.vlans = [ 2 ];

  causes the machine to only have an eth1 connected to network 2 with
  address 192.168.2.<i>.  So each virtual network <n> is assigned the
  IP range 192.168.<n>.0/24.

  Each virtual network is implemented using a separate multicast
  address on the host, so guests really cannot talk to networks to
  which they are not connected.

* Added a simple NAT test to demonstrate this.

* Added an option `virtualisation.qemu.options' to specify QEMU
  command-line options.  Used to factor out some commonality between
  the test driver script and the interactive test script.

svn path=/nixos/trunk/; revision=21928
2010-05-20 21:07:32 +00:00
Eelco Dolstra ad8ed39285 * It should not be necessary to run ntpd in the guest.
svn path=/nixos/trunk/; revision=21925
2010-05-20 14:51:46 +00:00
Yury G. Kudryashov 2dfd9b51ae gnupg2 is now called gnupg
svn path=/nixos/trunk/; revision=21889
2010-05-19 21:11:46 +00:00
Yury G. Kudryashov 12e43068cf More verbose udev log
svn path=/nixos/trunk/; revision=21881
2010-05-19 19:15:49 +00:00
Marc Weber 674d396576 adding initial support for proprietary ati drivers You have to add some impure paths, see: http://thread.gmane.org/gmane.linux.distributions.nixos/4145
svn path=/nixos/trunk/; revision=21847
2010-05-18 19:36:11 +00:00
Lluís Batlle i Rossell 7d6db6ac0c Fixing the pcscd job (daemonType)
svn path=/nixos/trunk/; revision=21845
2010-05-18 17:57:03 +00:00
Yury G. Kudryashov a0b97de260 Use polkit-agent-helper-1 from libexec/polkit-1
svn path=/nixos/trunk/; revision=21844
2010-05-18 16:46:32 +00:00
Eelco Dolstra 1133f664bd * Fix https printing (the symlink to ipp was broken).
svn path=/nixos/trunk/; revision=21841
2010-05-18 15:19:52 +00:00
Lluís Batlle i Rossell ee8ba3bb79 Updating bashrc, so it does not leave in PATH (and other environment variables) a void element, which
the linux kernel would take as '.'.
This fixes the bug of linux looking into '.' for executables.


svn path=/nixos/trunk/; revision=21818
2010-05-17 14:15:18 +00:00
Lluís Batlle i Rossell f13cf2cee0 Adding example for the fonts.extraFonts
(thanks roconnor)


svn path=/nixos/trunk/; revision=21817
2010-05-17 14:09:22 +00:00
Lluís Batlle i Rossell b15e575961 Renaming the tor services lowercase.
svn path=/nixos/trunk/; revision=21810
2010-05-16 22:22:34 +00:00
Eelco Dolstra 7484774172 * Activate software RAID devices from udev. This makes the swraid
Upstart jobs unnecessary.
* Support having the root filesystem on swraid.

svn path=/nixos/trunk/; revision=21807
2010-05-16 20:40:04 +00:00
Eelco Dolstra edee370883 * The default action for udevadm trigger' changed from add' to
`change'.  At boot time, however, we want an `add' event to trigger
  certain rules (e.g. LVM and mdadm).

svn path=/nixos/trunk/; revision=21804
2010-05-16 19:02:45 +00:00
Nicolas Pierron 1f2db38e9a Fix swraid for config which do not have any raid devices.
svn path=/nixos/trunk/; revision=21800
2010-05-16 16:36:01 +00:00
Nicolas Pierron 49dcb07bd9 Fix bad substitution of mdadm program name.
svn path=/nixos/trunk/; revision=21799
2010-05-16 16:35:51 +00:00
Lluís Batlle i Rossell a862661835 Adding the Tor service
(patch by roconnor)


svn path=/nixos/trunk/; revision=21795
2010-05-16 16:20:00 +00:00
Eelco Dolstra 8989d7a3d5 * Udev no longer likes the "%k" name in the kqemu rule, so remove it.
svn path=/nixos/trunk/; revision=21794
2010-05-16 09:39:41 +00:00
Yury G. Kudryashov 7836f89242 stage-1.nix: copy libudev.so, verbose log
svn path=/nixos/trunk/; revision=21793
2010-05-15 21:28:31 +00:00
Yury G. Kudryashov 7ae39feedb Get rid of extraSetuidPrograms.
Also state in description that it is obsolete.

svn path=/nixos/trunk/; revision=21777
2010-05-14 21:01:06 +00:00
Yury G. Kudryashov 03caab4572 Enable polkit-1
Now both polkit-1 and old policykit are enabled. Packages that can use both will
be migrated to new polkit-1, than old one can be disabled.

svn path=/nixos/trunk/; revision=21776
2010-05-14 20:28:04 +00:00
Marc Weber 680818c2cc postgresql: allow adding plugins ot $libdir
svn path=/nixos/trunk/; revision=21692
2010-05-09 20:42:00 +00:00
Lluís Batlle i Rossell 8b69834669 Fixing a syntax error in the vsftpd module I added in a recent commit.
svn path=/nixos/trunk/; revision=21687
2010-05-09 15:38:48 +00:00
Lluís Batlle i Rossell 4ee2a8a29a Fixing the UTF-8 in openssh sshd (passing to it the LOCALE_ARCHIVE - that
requieres a patch in openssh that I just commited to nixpkgs)

Before this, in the shell spawned, backspace could not work over UTF-8 strings in the readline.


svn path=/nixos/trunk/; revision=21679
2010-05-09 12:45:57 +00:00
Lluís Batlle i Rossell 825923a051 Adding the 'awesome' window manager to nixos.
I made the system sw path include /etc/xdg - awesome looks for some file
in the XDG_CONFIG_DIRS, which in bashrc is set to point to the profiles/etc/xdg


svn path=/nixos/trunk/; revision=21675
2010-05-08 23:24:00 +00:00
Ludovic Courtès 4c1af311e1 avahi-daemon: Ensure that /var/run/avahi-daemon exists.
svn path=/nixos/trunk/; revision=21673
2010-05-08 22:28:26 +00:00
Lluís Batlle i Rossell 0d92459fb5 Fixing vsftpd regarding the anonymous user (some script lines had to be run
only in the case the anonymous user service were enabled)


svn path=/nixos/trunk/; revision=21669
2010-05-08 19:12:36 +00:00
Lluís Batlle i Rossell f8ff75202e Fixing the mountd nfs upstart script (about /etc/exports and its contents)
svn path=/nixos/trunk/; revision=21668
2010-05-08 19:02:54 +00:00
Nicolas Pierron 06bfb319fe Add extra module argument to provide a nesting.clone option. This option
does the same as nesting.children except that each configuration inherits
from the top-level configuration.

svn path=/nixos/trunk/; revision=21663
2010-05-08 17:18:26 +00:00
Nicolas Pierron 1ba1b66efd Add services.xserver.screenSection to add additional screen options.
svn path=/nixos/trunk/; revision=21662
2010-05-08 17:18:22 +00:00
Nicolas Pierron 43fcf8a2b2 Fix swraid device detection on boot.
svn path=/nixos/trunk/; revision=21661
2010-05-08 17:18:16 +00:00
Eelco Dolstra c1f7622512 * Improve obsolete/deprecated option warnings.
svn path=/nixos/trunk/; revision=21653
2010-05-07 15:14:50 +00:00
Ludovic Courtès 8fcbaefd2e Refer to IceCat instead of Firefox.
svn path=/nixos/trunk/; revision=21636
2010-05-06 20:52:06 +00:00
Lluís Batlle i Rossell e4e3789dad Make privoxy run with uid=privoxy.
Patch by Russell O'Connor, sent to nix-dev.


svn path=/nixos/trunk/; revision=21551
2010-05-02 04:38:45 +00:00
Lluís Batlle i Rossell b690751956 Fixing the kwm nixos module - the kde3 attribute path changed in nixpkgs.
svn path=/nixos/trunk/; revision=21549
2010-05-01 20:25:57 +00:00
Lluís Batlle i Rossell 65a4991eee I forgot the username in the system cron job for logrotate. So it did not work until now.
svn path=/nixos/trunk/; revision=21479
2010-05-01 13:23:32 +00:00
Marc Weber 6daed6b8d2 setting default of copySystemConfiguration to false.
http://thread.gmane.org/gmane.linux.distributions.nixos/3990

svn path=/nixos/trunk/; revision=21450
2010-04-30 07:43:29 +00:00
Yury G. Kudryashov 0829b8ea8c Link /etc/{xdg,dbus-1} if KDE is enabled
svn path=/nixos/trunk/; revision=21449
2010-04-30 07:36:24 +00:00
Yury G. Kudryashov 9d33d05269 Add $profile/lib/qt4/plugins to QT_PLUGIN_PATH
svn path=/nixos/trunk/; revision=21448
2010-04-30 07:36:19 +00:00
Lluís Batlle i Rossell 27886d8288 Fixing an xml manual tag (the manual did not validate, so, its build failed)
svn path=/nixos/trunk/; revision=21440
2010-04-29 19:06:18 +00:00
Lluís Batlle i Rossell cf3f1e9f23 INFOPATH fix; the info.nix module should not set the INFOPATH variable in bashrc,
because the bashrc already cares on that, even taking into account all the usual
nixos profiles.

As a side change, I changed a tab to spaces in bashrc.


svn path=/nixos/trunk/; revision=21439
2010-04-29 18:59:05 +00:00
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