Commit graph

637 commits

Author SHA1 Message Date
Eelco Dolstra 968437c5d0 * Enable xfce4-mixer.
svn path=/nixos/trunk/; revision=24208
2010-10-10 22:35:18 +00:00
Lluís Batlle i Rossell 79ded36abf Making cron/fcron set their setuid wrappers. And made fcron use the nixos systemCrontabJobs by
default.
It does not look very modular, and the manual may not look very good, but I think it
works better than before. And setting cron.enable = false and fcron.enable = true works fine.


svn path=/nixos/trunk/; revision=24199
2010-10-10 11:35:15 +00:00
Lluís Batlle i Rossell dc11ce585f Making vixie cron have the usual enable/disable nixos service option.
svn path=/nixos/trunk/; revision=24198
2010-10-10 11:14:02 +00:00
Lluís Batlle i Rossell 70a2ad7898 Requiring nixpkgs 24196, I made nixos set the sendmail path to vixie cron, so
now vixie cron can send mail properly, for example if a user enabled the
'postfix' service.


svn path=/nixos/trunk/; revision=24197
2010-10-10 11:08:10 +00:00
Lluís Batlle i Rossell a069fcffc6 Making a nixos option about the system 'sendmail', which postfix sets, for example.
svn path=/nixos/trunk/; revision=24193
2010-10-10 10:43:28 +00:00
Eelco Dolstra f9d4df1e04 svn path=/nixos/trunk/; revision=24185 2010-10-08 12:57:21 +00:00
Ludovic Courtès 8d88e37b27 avahi-daemon: Remove outdated and confusing comment.
svn path=/nixos/trunk/; revision=24152
2010-10-07 20:10:49 +00:00
Rob Vermaas d556b86f75 hydra-mirror: enable binary patches
svn path=/nixos/trunk/; revision=24133
2010-10-07 12:46:26 +00:00
Eelco Dolstra 102a1e15ba * Use the "iburst" flag. This makes ntpd synchronise in a few seconds rather than
a few minutes by sending an initial burst of messages to the time servers.

svn path=/nixos/trunk/; revision=24119
2010-10-06 16:03:37 +00:00
Rob Vermaas f2f048db4d mercurial/apache: put PYTHONPATH in globalEnvVars
svn path=/nixos/trunk/; revision=24115
2010-10-06 12:38:37 +00:00
Rob Vermaas 8d60cad42a mercurial: initial version for hgweb apache module
svn path=/nixos/trunk/; revision=24111
2010-10-06 11:21:15 +00:00
Eelco Dolstra 35562ea4a3 * Don't daemonize; otherwise Upstart will respawn it.
svn path=/nixos/trunk/; revision=24081
2010-10-05 15:17:09 +00:00
Eelco Dolstra c8fc492acf * Start atd when udev has finished completely. Hopefully this fixes
the random atd failures at boot time, which seem to be caused by a
  race with the creation of /dev/null or something.

svn path=/nixos/trunk/; revision=24077
2010-10-05 14:22:06 +00:00
Evgeny Egorochkin ac7ef33e4a Tor: socksListenAddress must always be in ip:port format
svn path=/nixos/trunk/; revision=24022
2010-10-02 02:19:17 +00:00
Russell O'Connor 2811c7270a Replacing tsocks with torsocks.
tsocks leaks DNS requests and is less secure than torsocks.

torsocks is a fork of tsocks that is patched specifically for Tor.


svn path=/nixos/trunk/; revision=24012
2010-10-01 03:41:43 +00:00
Eelco Dolstra ab8a6d43c4 svn path=/nixos/trunk/; revision=23998 2010-09-30 13:53:30 +00:00
Rob Vermaas 8a37500355 initial try for a nixos module for hydra channel mirroring
svn path=/nixos/trunk/; revision=23990
2010-09-29 11:31:09 +00:00
Evgeny Egorochkin 88b24ece7f Quassel: quick fix
svn path=/nixos/trunk/; revision=23930
2010-09-26 02:10:23 +00:00
Evgeny Egorochkin b766f8ac8d AMule: quick fix
svn path=/nixos/trunk/; revision=23929
2010-09-26 02:09:34 +00:00
Evgeny Egorochkin 3bca96e1bd AMule: create the user only if the user option is null, don't pollute the system profile with useless packages.
svn path=/nixos/trunk/; revision=23928
2010-09-26 02:04:06 +00:00
Evgeny Egorochkin d8c72719aa Quassel: Create quassel user only if cfg.user is left empty to avoid messing up existing users.
This solution is still suboptimal but others are even worse.

svn path=/nixos/trunk/; revision=23927
2010-09-26 01:58:44 +00:00
Evgeny Egorochkin 9b7533c2fd KDE4: fix suid for kcheckpass, although suid doesn't seem to be needed if you use PAM
svn path=/nixos/trunk/; revision=23906
2010-09-22 23:08:05 +00:00
Evgeny Egorochkin 910103246f TOR: make torify work(only when enabled as a service. nix-env -i tor replaces it with a broken version.)
svn path=/nixos/trunk/; revision=23905
2010-09-22 23:07:59 +00:00
Evgeny Egorochkin c0751f83e9 Quassel: don't pollute profiles with useless files
svn path=/nixos/trunk/; revision=23904
2010-09-22 23:07:52 +00:00
Yury G. Kudryashov 1319531f28 Add system.path to PATH instead of overriding
svn path=/nixos/trunk/; revision=23879
2010-09-21 09:16:47 +00:00
Evgeny Egorochkin 36fe7f69c6 Quassel: get rid of custom logging remnants
svn path=/nixos/trunk/; revision=23867
2010-09-20 01:44:07 +00:00
Evgeny Egorochkin e5aea56bb5 TOR: prevent creation of torPrivoxy.conf if Privoxy is disabled.
Patch by Russel O'Connor

svn path=/nixos/trunk/; revision=23862
2010-09-19 15:40:03 +00:00
Evgeny Egorochkin 385ec89817 TOR: client should be disabled by default
svn path=/nixos/trunk/; revision=23860
2010-09-18 16:36:03 +00:00
Evgeny Egorochkin 764f5f34fd Quassel: use the generic logging for jobs instead of rolling your own.
svn path=/nixos/trunk/; revision=23854
2010-09-18 12:50:55 +00:00
Evgeny Egorochkin 39193fa1e7 Folding@Home service: don't make binaries visible
svn path=/nixos/trunk/; revision=23852
2010-09-18 12:44:03 +00:00
Evgeny Egorochkin 41530c8e76 TOR service: sane default for burst rate
svn path=/nixos/trunk/; revision=23851
2010-09-18 12:43:48 +00:00
Evgeny Egorochkin b2b227c99f TOR service: refactored options to avoid mess
svn path=/nixos/trunk/; revision=23850
2010-09-18 11:30:14 +00:00
Evgeny Egorochkin 259c007f70 Quassel: use the convenience daemon package.
svn path=/nixos/trunk/; revision=23849
2010-09-18 11:30:09 +00:00
Evgeny Egorochkin 1b4c811d41 Added AMule daemon service
svn path=/nixos/trunk/; revision=23848
2010-09-18 11:30:04 +00:00
Eelco Dolstra 82f97b5fb2 * Allow modules to add packages to the $PATH seen by programs called
from udev rules.  This is slightly tricky because udev has a
  512-character limit on environment variables, so we create a symlink
  tree to work around this.

svn path=/nixos/trunk/; revision=23822
2010-09-16 15:23:12 +00:00
Evgeny Egorochkin dc8eff071a Added Folding@Home service
svn path=/nixos/trunk/; revision=23816
2010-09-16 02:06:44 +00:00
Eelco Dolstra ea4d3e2c8c * Don't run dhclient on Xen's peth* devices.
svn path=/nixos/trunk/; revision=23779
2010-09-14 11:17:48 +00:00
Eelco Dolstra f729f12e4e Some cleanups in the activation script:
* Moved some scriptlets to the appropriate modules.
* Put the scriptlet that sets the default path at the start, since it
  never makes sense not to have it there.  It no longer needs to be
  declared as a dependency.
* If a scriptlet has no dependencies, it can be denoted as a plain
  string (i.e., `noDepEntry' is not needed anymore).

svn path=/nixos/trunk/; revision=23762
2010-09-13 15:41:38 +00:00
Evgeny Egorochkin 9f06fb806c Fix TOR option descriptions: kbytes-> bytes
svn path=/nixos/trunk/; revision=23735
2010-09-11 11:43:09 +00:00
Sander van der Burg 10a3bd6ffe Added virtualbox service, which fixes the RandR problem and also keeps the guest's clock in sync with the host
svn path=/nixos/trunk/; revision=23672
2010-09-07 13:28:17 +00:00
Nicolas Pierron c9dc3651da Replace mkOverride by its alias mkOverrideTemplate to remove the unused
template argument of mkOverride later.

svn path=/nixos/trunk/; revision=23631
2010-09-03 19:10:59 +00:00
Nicolas Pierron 6fa66ff7b9 Move matches just below the identifier.
svn path=/nixos/trunk/; revision=23628
2010-09-03 19:10:45 +00:00
Eelco Dolstra 2ac462c3c7 * Set NIX_CONF_DIR in cronjobs. Otherwise the garbage collector won't see
the system nix.conf.

svn path=/nixos/trunk/; revision=23561
2010-08-31 12:57:47 +00:00
Eelco Dolstra 59b29535e5 * Include the Bluetooth module in module-list.nix.
svn path=/nixos/trunk/; revision=23486
2010-08-27 15:32:49 +00:00
Lluís Batlle i Rossell 63c3d72aa6 Updating the nvidiaLegacy nixos xserver driver to a numbered name, to match the current
*two* possibilities of nvidia legacy driver in nixpkgs.


svn path=/nixos/trunk/; revision=23412
2010-08-24 22:00:18 +00:00
Lluís Batlle i Rossell 1e7058d025 Removing the NvAGP special option for nvidiaLegacy. Although it helped in
suspending the machine, it also slowed down the graphics (specially 2D) quite a lot.
firefox flash, firefox scrolling was a pain.

I'll leave that up to the nixos user with the cfg.deviceSection.


svn path=/nixos/trunk/; revision=23407
2010-08-24 18:24:06 +00:00
Yury G. Kudryashov a7d7f1630f Will move digikam outside of kde4 in kde4.5, so change example
svn path=/nixos/trunk/; revision=23266
2010-08-19 23:07:14 +00:00
Eelco Dolstra 4c8fb8d4b2 * The "atd" job tends to fail randomly on startup for unknown
reasons.  Doing "atd -f" seems to work better.

svn path=/nixos/trunk/; revision=23251
2010-08-19 14:50:48 +00:00
Eelco Dolstra c55f496c52 * The ALSA job shouldn't be started until udevtrigger has finished.
Otherwise the sound card drivers may not have been loaded yet, and
  restoring the mixer settings will fail.  Also, since the ALSA job
  itself will fail, it won't save the mixer settings on shutdown.

svn path=/nixos/trunk/; revision=23245
2010-08-19 11:55:52 +00:00
Eelco Dolstra 751ec4f845 * Xfce requires desktop-file-utils to create/update .desktop files.
svn path=/nixos/trunk/; revision=23183
2010-08-16 07:48:06 +00:00
Eelco Dolstra 2ec105cc85 * Separate building of the NixOS manual and manpages. Usually we only
need the manpages, and the manual takes much longer to build.

svn path=/nixos/trunk/; revision=23112
2010-08-11 12:28:53 +00:00
Eelco Dolstra 2e0a569187 * Use InputClass in the synaptics module to automatically use the
synaptics driver for all touchpads (unless the "dev" option is set).
* Get rid of some synaptics options: SHMConfig, Repeater (obsolete);
  *Edge (usually auto-detected), Protocol (use auto-detect instead).

svn path=/nixos/trunk/; revision=23092
2010-08-10 14:13:57 +00:00
Eelco Dolstra 5456815016 * Re-enable ctrl-alt-backspace to kill the X server.
svn path=/nixos/trunk/; revision=23089
2010-08-10 12:37:39 +00:00
Eelco Dolstra 8de6ab7dff * Enable the Xfce power manager.
svn path=/nixos/trunk/; revision=23079
2010-08-09 23:15:39 +00:00
Eelco Dolstra c388446bb0 * Xfce is now more or less functional.
svn path=/nixos/trunk/; revision=23075
2010-08-09 21:59:34 +00:00
Eelco Dolstra 31db968be4 * In QEMU, set a higher refresh rate in xorg.conf so that resolutions
higher than 800x600 work.
* Add a "Monitor" statement to the "Screen" section, because otherwise
  the Monitor section is ignored.

svn path=/nixos/trunk/; revision=23068
2010-08-09 20:10:16 +00:00
Eelco Dolstra 057602f3f2 * Some subdirectories should always be symlinked in the system path
when X11 is enabled (e.g. etc/xdg, share/icons...).

svn path=/nixos/trunk/; revision=23062
2010-08-09 18:04:55 +00:00
Eelco Dolstra f6497fa576 * Use the proper Xfce session start script. Include the desktop and
the panel.

svn path=/nixos/trunk/; revision=23055
2010-08-09 11:51:44 +00:00
Eelco Dolstra fc8204c0e4 * Always symlink etc/dbus-1 and share/dbus-1 in the system path, not
just when KDE is enabled.

svn path=/nixos/trunk/; revision=23053
2010-08-09 11:42:32 +00:00
Eelco Dolstra 5041cdddbd * Start of an Xfce desktop manager module. Currently it just starts
Xfwm and Terminal.

svn path=/nixos/trunk/; revision=23048
2010-08-08 22:45:54 +00:00
Eelco Dolstra 6e118cd66b * Change the default desktop manager from "xterm" to the last imported
and enabled desktop manager (e.g. "kde" if KDE is enabled, and
  "xterm" if nothing is explicitly enabled).  This means that you
  don't have to write

    services.xserver.desktopManager.default = "kde4";

  anymore in addition to

    services.xserver.desktopManager.kde4.enable = true;

  to make KDE the default desktop environment.
  
* Remove the "none + none" session type.

* Remove the "+ none" string at the end of session types.  I.e. now
  it's "kde", not "kde + none".

* In kdm, add coreutils to its SystemPath so that it can remove the
  temporary directories in /tmp that it creates.

svn path=/nixos/trunk/; revision=23036
2010-08-08 14:05:32 +00:00
Eelco Dolstra 87dcdc05fe * Fix example.
svn path=/nixos/trunk/; revision=23035
2010-08-08 13:57:21 +00:00
Eelco Dolstra 622a7d3d46 * If kdm is enabled, disabled slim automatically. This is so that
users don't have to write

    services.xserver.displayManager.kdm.enable = true;
    services.xserver.displayManager.slim.enable = false;

  to enable kdm, but just

    services.xserver.displayManager.kdm.enable = true;


svn path=/nixos/trunk/; revision=23033
2010-08-08 12:39:00 +00:00
Michael Raskin 3cab6d3e1c Fixing extra /bin/sh in the shell - noticed by Eelco Dolstra
svn path=/nixos/trunk/; revision=23021
2010-08-07 11:16:06 +00:00
Michael Raskin dec8079468 Fix stdenv reference
svn path=/nixos/trunk/; revision=23020
2010-08-07 10:26:37 +00:00
Eelco Dolstra ea49707f85 * Run CUPS' external programs in the "lp" group so that they can
access printer devices in /dev.  Also use a "cups" user instead of
  "nobody".

svn path=/nixos/trunk/; revision=23003
2010-08-06 14:52:09 +00:00
David Guibert 6436ed1de4 nixos: kerberos services for the server.
svn path=/nixos/trunk/; revision=22985
2010-08-06 08:49:08 +00:00
Eelco Dolstra 793767870a * Disable writing dhclient debug info to /tmp/dhcp-exit.
svn path=/nixos/trunk/; revision=22962
2010-08-05 13:32:58 +00:00
Michael Raskin 255a56fbc5 allow wildcard Synaptics configuration
svn path=/nixos/trunk/; revision=22954
2010-08-04 20:07:58 +00:00
Eelco Dolstra e3c2a1f49e * Fix the dump feature.
svn path=/nixos/trunk/; revision=22950
2010-08-04 14:05:14 +00:00
Sander van der Burg 9a94e561a5 The DocumentRoot directory is now automatically created if it does not exists. This will prevent the service from working if a user forgets to create the DocumentRoot directory himself and this also makes automated testing easier.
svn path=/nixos/trunk/; revision=22929
2010-08-03 13:48:08 +00:00
Lluís Batlle i Rossell 02bf0db39e Making the X keyboard settings go in xorg.conf, and not in HAL anymore.
Setting to the synaptics default speeds the speeds I like. I think we were having
defaults still from the time the values meant some different speeds.

The 'synclient' program now does not work, but the 'xinput' program (xorg.xinput)
can modify in runtime the touchpad settings too.


svn path=/nixos/trunk/; revision=22904
2010-08-02 19:06:42 +00:00
Eelco Dolstra 25fd35862a * Add /nix/var/nix/profiles/default and config.system.path to the list
of DBus configuration directories.  Thus packages with DBus
  configuration files installed in the default profile will be found
  automatically.  (It would be nice to include $HOME/.nix-profile in
  the session bus search path, but I don't think that's possible.)

svn path=/nixos/trunk/; revision=22737
2010-07-26 14:10:04 +00:00
Eelco Dolstra c52cbca24d * Set $TZ in the X server job (mostly so that the kdm clock shows the
right time).

svn path=/nixos/trunk/; revision=22728
2010-07-25 09:52:20 +00:00
Evgeny Egorochkin 2e9851cec2 Fix udev startup issue in OpenVZ guest environment
svn path=/nixos/trunk/; revision=22725
2010-07-24 22:05:27 +00:00
Eelco Dolstra b835f7f0dd * Fix PostgreSQL boot.
svn path=/nixos/trunk/; revision=22615
2010-07-15 21:21:16 +00:00
Eelco Dolstra f0b647c326 * Allow the Apache submodules to declare whether they need PHP.
Don't depend on PHP unless this is the case.

svn path=/nixos/trunk/; revision=22600
2010-07-14 12:58:38 +00:00
Eelco Dolstra fb97b5b122 * MediaWiki 1.15.4.
svn path=/nixos/trunk/; revision=22589
2010-07-13 21:11:35 +00:00
Wouter den Breejen e058f7ea45 sabnzbd now really starts at boot
svn path=/nixos/trunk/; revision=22579
2010-07-13 14:45:44 +00:00
Eelco Dolstra 2b7ac80b3d * Style changes.
svn path=/nixos/trunk/; revision=22573
2010-07-13 09:23:35 +00:00
Eelco Dolstra 44656be396 * dbus-daemon: use /etc/dbus-1/system.conf (i.e. ‘--system’) rather than
${configDir}/system.conf.  This is necessary to enable dbus to
  reload its configuration on SIGHUP after a nixos-rebuild.  (The
  daemon cannot be restarted because then console-kit-daemon loses its
  state.)
* Generate a proper /etc/dbus-1/session.conf.

svn path=/nixos/trunk/; revision=22572
2010-07-13 09:22:52 +00:00
Eelco Dolstra c50948309d * Add a missing dependency.
svn path=/nixos/trunk/; revision=22563
2010-07-12 15:32:23 +00:00
Eelco Dolstra 9600035e02 * Don't use "starting" events because they basically don't work - they
cause restarting of jobs to hang indefinitely because the required
  "start on" condition never triggers.

  For instance, after "stop nfs-kernel-nfsd", "start nfs-kernel-nfsd"
  will hang until we do "stop portmap; start portmap".  This is due to
  the "starting nfs-kernel-nfsd and started portmap" condition in
  the nfs-kernel-mountd job.  Apparently, because portmap is already
  running, the condition "started portmap" never happens because no
  event is emitted.

svn path=/nixos/trunk/; revision=22562
2010-07-12 15:14:26 +00:00
Eelco Dolstra b51e309c89 * `sm-notify' should also run on the server
(http://hydra.nixos.org/build/483567).  I love regression tests.

svn path=/nixos/trunk/; revision=22559
2010-07-12 13:03:27 +00:00
Evgeny Egorochkin a86b1bd43d Improved the TOR service to be able to act as a TOR relay and disable the client functionality. Doesn't change the behavior of the existing TOR configurations.
svn path=/nixos/trunk/; revision=22554
2010-07-12 06:03:52 +00:00
Eelco Dolstra abbc2f4f2b * Make acpid depend on syslogd (to prevent it printing startup
messages to the console).

svn path=/nixos/trunk/; revision=22545
2010-07-09 12:35:06 +00:00
Eelco Dolstra 54a4eead20 * Typos.
svn path=/nixos/trunk/; revision=22537
2010-07-08 16:21:55 +00:00
Eelco Dolstra 5c0f6619cf * Idem.
svn path=/nixos/trunk/; revision=22535
2010-07-08 15:54:10 +00:00
Eelco Dolstra 6856c60ba3 * There is no "samba-control" job.
svn path=/nixos/trunk/; revision=22509
2010-07-07 12:32:56 +00:00
Eelco Dolstra 9ac60a3aa3 * Merge the ‘nfs-kernel-sm-notify’ task into the post-start script of
the ‘nfs-kernel-statd’ task.
* Work around an apparent bug in Upstart: the ‘mountall’ task cannot
  be restarted because of the ‘starting mountall’ condition in the
  statd task.  So instead make ‘mountall’ depend on ‘started
  nfs-kernel-statd’.

svn path=/nixos/trunk/; revision=22508
2010-07-07 12:11:29 +00:00
Eelco Dolstra 54d201294b * Sync with the trunk.
svn path=/nixos/branches/boot-order/; revision=22487
2010-07-06 08:21:05 +00:00
Eelco Dolstra da0d5c5645 * Use config.system.build.grub rather than pkgs.grub to get the right
GRUB when version 2 is enabled.

svn path=/nixos/branches/boot-order/; revision=22479
2010-07-05 14:33:11 +00:00
Wouter den Breejen 2335cb65a3 Added sabnzbd :)
SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an .nzb. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction.

http://sabnzbd.org/

svn path=/nixos/trunk/; revision=22446
2010-07-03 15:10:48 +00:00
Evgeny Egorochkin ebd9fb6cf3 Added Quassel IRC client service
svn path=/nixos/trunk/; revision=22425
2010-06-28 18:36:37 +00:00
Marc Weber 0dd9b4caaf reverting -r22286
svn path=/nixos/trunk/; revision=22358
2010-06-21 14:17:19 +00:00
Eelco Dolstra d43d321e86 * Sync with the trunk.
svn path=/nixos/branches/boot-order/; revision=22349
2010-06-20 20:54:31 +00:00
Marc Weber d0fd8da8f0 example how to pass options to nix-daemon
svn path=/nixos/trunk/; revision=22286
2010-06-15 19:04:06 +00:00
Eelco Dolstra 03f77ca82b * PostgreSQL / MySQL: depend on the "filesystem" event.
svn path=/nixos/branches/boot-order/; revision=22247
2010-06-13 20:59:49 +00:00
Lluís Batlle i Rossell b25771532a Fixing the postfix start/stop (through an upstart job script code that will
monitor the life of postfix)

Adding an assert to upstart jobs, so those with preStop will always need an exec or
script, otherwise the preStop will not be run.


svn path=/nixos/trunk/; revision=22225
2010-06-11 21:44:06 +00:00
Eelco Dolstra a5c433696c * Put all of /var/run (not just /var/run/nscd) on a tmpfs to simplify
shutdown.  (Portmap and statd are needed during shutdown to unmount
  NFS volumes but have open files in /var/run.)
* In the shutdown job, don't kill PIDs belonging to Upstart jobs that
  are still running.  If they don't stop on the "starting shutdown"
  event, then they're needed during shutdown (such as portmap and
  statd).
* NFS test: test whether the shutdown quickly unmounts NFS volumes
  (i.e. whether portmap and statd are still running).

svn path=/nixos/branches/boot-order/; revision=22204
2010-06-09 22:29:06 +00:00
Eelco Dolstra 94088e9b48 * Daemonise mountd/statd.
svn path=/nixos/branches/boot-order/; revision=22198
2010-06-09 13:45:51 +00:00
Eelco Dolstra 645ed8d3b4 * Start NFS daemons in the right order as described in the nfs-utils
README (i.e. for the server: exportfs, mountd, statd, nfsd,
  sm-notify; for the client: statd / sm-notify before mountall).  This
  is important to allow locking to work correctly.

svn path=/nixos/branches/boot-order/; revision=22196
2010-06-09 13:18:01 +00:00
Eelco Dolstra d837ae4914 * portmap: don't use the -f flag to ensure that when the job reaches
the "started" state, portmap is actually up.

svn path=/nixos/branches/boot-order/; revision=22192
2010-06-09 11:15:25 +00:00
Eelco Dolstra 5ddaf9b963 * Set `services.nfsKernel.client.enable' automatically if there is a
filesystem with type "nfs" or "nfs4".

svn path=/nixos/branches/boot-order/; revision=22189
2010-06-08 16:14:41 +00:00
Eelco Dolstra a9e8bf6491 * nfsd: run rpc.nfsd from the pre-start script since it's not actually
a daemon (it just starts some kernel threads).  In the post-stop
  script, stop the kernel threads.
* exportfs: fix the createMountPoints option.
* Mount the nfsd filesystem on /proc/fs/nfsd because mountd prefers
  this.

svn path=/nixos/branches/boot-order/; revision=22187
2010-06-08 16:01:31 +00:00
Lluís Batlle i Rossell dadd6d63e7 oops. Fixing the cupsd path. How to set a single path there in the job? I don't know.
svn path=/nixos/trunk/; revision=22174
2010-06-07 21:44:06 +00:00
Lluís Batlle i Rossell 9e275ffa58 Trying to improve the cups expression a bit, so it can print also with local usb printers.
(Thank you Oleksandr)


svn path=/nixos/trunk/; revision=22173
2010-06-07 21:09:27 +00:00
Eelco Dolstra 48fdc931a4 * Run udevtrigger in a separate job. This speeds up booting because
it allows the `mountall' task to start mounting filesystems as soon
  as udev is running and devices become available (i.e. it doesn't
  have to wait for all devices).  This means that some jobs should
  depend on "stopped udevtrigger" instead of "started udev".

svn path=/nixos/branches/boot-order/; revision=22167
2010-06-07 12:39:50 +00:00
Eelco Dolstra 6290788247 * If mountall fails to mount all filesystems, start an emergency shell
to allow the user to fix or ignore the problem.

svn path=/nixos/branches/boot-order/; revision=22165
2010-06-07 12:15:55 +00:00
Eelco Dolstra dbadf6e9c2 * Use mountall to mount all filesystems and activate all swap devices
during boot.  Mountall ensures that these are done in the right
  order.  It's informed by udev about devices becoming available.  It
  emits some Upstart events upon reaching certain states, in
  particular ‘local-filesystems’ after all local filesystems have been
  mounted successfully, ‘remote-filesystems’ after all network
  filesystems have been mounted, and ‘filesystem’ (sic) when all
  filesystems have been mounted.

  Currently, if a filesystem fails to mount or doesn't exist, then the
  mingettys won't start and the boot will appear to hang.  This is
  because mountall doesn't emit an event for failing filesystems and
  waits indefinitely for the filesystems to become available.

* The ‘filesystems’ and ‘swap’ Upstart jobs are gone.  (Support for
  encrypted swap devices is temporarily gone.)
  
* Generate a proper /etc/fstab from the ‘fileSystems’ and
  ‘swapDevices’ options.

svn path=/nixos/branches/boot-order/; revision=22148
2010-06-04 14:22:11 +00:00
Eelco Dolstra c089738bdc * Use the shadow' package instead of pwdutils', `pam_login' and
`su'.
* The `usermod' from `shadow' allows setting a supplementary group
  equal to the user's primary group, so the special hack for the
  `nixbld' group is no longer needed.
* Removed /etc/default/passwd since it's not used by the new passwd.
  The hash is configured in pam_unix.
* Move some values for `security.setuidPrograms' and
  `security.pam.services' to the appropriate modules.

svn path=/nixos/trunk/; revision=22107
2010-06-02 21:10:48 +00:00
Eelco Dolstra d67e6e6285 * Remove some `stopOn = "ip-down"' declarations since they probably
don't do the right thing (e.g. they don't distinguish between
  network interfaces).

svn path=/nixos/trunk/; revision=22102
2010-06-02 16:19:48 +00:00
Eelco Dolstra d317d83ba8 * Remove `stopOn = "shutdown"' which doesn't work.
svn path=/nixos/trunk/; revision=22101
2010-06-02 16:05:09 +00:00
Eelco Dolstra b135e38bea * atd's postStop action should be unnecessary.
svn path=/nixos/trunk/; revision=22095
2010-06-01 20:42:33 +00:00
Eelco Dolstra 95a9c5dd77 * Log the standard output/error of Upstart jobs to
/var/log/upstart/<jobname> rather than spamming the console with it.

svn path=/nixos/trunk/; revision=22093
2010-06-01 19:44:23 +00:00
Eelco Dolstra dc49a0ce3f * Don't use klibc in the initrd. It's simpler (and slightly smaller)
to use the standard (coreutils) tools.
* Use util-linux's `switch_root' to switch over to the target root
  FS.  It automatically moves over the /dev, /proc and /sys from stage
  1, so stage 2 doesn't need to set them up again.

svn path=/nixos/trunk/; revision=22085
2010-06-01 15:53:24 +00:00
Eelco Dolstra eb4c33eeca * Added an option to enable support for 32-bit binaries (such as Wine
or Google Earth) on 64-bit NixOS on NVIDIA hardware.  The 32-bit
  OpenGL library is symlinked from /var/run/opengl-driver-32, which is
  added to the LD_LIBRARY_PATH so that 32-bit binaries can find it.

svn path=/nixos/trunk/; revision=22062
2010-05-30 22:00:52 +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
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
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 b15e575961 Renaming the tor services lowercase.
svn path=/nixos/trunk/; revision=21810
2010-05-16 22:22:34 +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 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 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
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 1ba1b66efd Add services.xserver.screenSection to add additional screen options.
svn path=/nixos/trunk/; revision=21662
2010-05-08 17:18:22 +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
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
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 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
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
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
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 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
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
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
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
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 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
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
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 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 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 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
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
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 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 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
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
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
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 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
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