Commit Graph

319 Commits

Author SHA1 Message Date
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
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
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
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
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
Marc Weber
99644df67a customizable PHPRC
svn path=/nixos/trunk/; revision=19267
2010-01-06 17:05:57 +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
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
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
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