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