Michael Raskin
ddc5a7d7c5
Oops, placed mkIf in the wrong place. Fixing
...
svn path=/nixos/trunk/; revision=18402
2009-11-18 09:30:38 +00:00
Michael Raskin
a94da97354
Make monit actually switchable off
...
svn path=/nixos/trunk/; revision=18401
2009-11-18 09:29:43 +00:00
Michael Raskin
1a05efa66a
Adding Monit - one more service to watch system..
...
svn path=/nixos/trunk/; revision=18399
2009-11-18 08:39:10 +00:00
Michael Raskin
f9958cbb44
Update kernel version for fresh-kernel
...
svn path=/nixos/trunk/; revision=18379
2009-11-17 09:00:49 +00:00
Lluís Batlle i Rossell
e164ea4df8
Fixing bash syntax errors in the generations-dir builder.
...
svn path=/nixos/trunk/; revision=18342
2009-11-13 19:30:39 +00:00
Marc Weber
5cb52cc7cb
nixos vms tests: use relative path to services, nixpkgs because this is more like to work if you don't put the repos in /etc/nixos/
...
svn path=/nixos/trunk/; revision=18330
2009-11-11 23:54:54 +00:00
Sander van der Burg
4af37a0994
VirtualBox Xorg driver needs xrefresh, so added it to the environment when using the virtualbox driver
...
svn path=/nixos/trunk/; revision=18322
2009-11-10 15:25:50 +00:00
Marco Maggesi
4bc162df4c
Add configurations for package OpenAFS (added forgotten files)
...
svn path=/nixos/trunk/; revision=18321
2009-11-10 15:22:57 +00:00
Marco Maggesi
f9b44a7f0d
Add configurations for package OpenAFS
...
svn path=/nixos/trunk/; revision=18320
2009-11-10 15:01:12 +00:00
Lluís Batlle i Rossell
de1713a24f
Failing when the top level system expression cannot find the kernel image
...
svn path=/nixos/trunk/; revision=18291
2009-11-08 18:32:21 +00:00
Lluís Batlle i Rossell
420639a4b1
Making generations-dir consider the pkgs.platform.
...
stdenv-updates stuff. Still to be reviewed, but at least an implementation to have
some different armv5tel-linux platforms: qemu versatile and the sheevaplug.
svn path=/nixos/trunk/; revision=18290
2009-11-08 17:38:35 +00:00
Nicolas Pierron
616c844336
* Move the default value of videoDrivers into the default field of the
...
option. Otherwise, the system may depends on unused/unsupported
softwares and users will be force to use properties in their
configuration.nix file to override this default value. (too complex for
new users)
svn path=/nixos/trunk/; revision=18288
2009-11-08 16:01:22 +00:00
Eelco Dolstra
37470cccc5
* Blacklist the "evbug" module.
...
svn path=/nixos/trunk/; revision=18285
2009-11-08 09:08:50 +00:00
Eelco Dolstra
16c2aa734f
* Generate /etc/modprobe.conf to allow the setting of module options
...
and the blacklisting of modules.
svn path=/nixos/trunk/; revision=18284
2009-11-08 09:01:53 +00:00
Wouter den Breejen
b0ba17873c
Fixed hash replace with a variable to the real hash
...
svn path=/nixos/trunk/; revision=18268
2009-11-07 21:03:57 +00:00
Eelco Dolstra
c0f732f079
* Work around a lack of laziness in the xserver.nix module.
...
svn path=/nixos/trunk/; revision=18216
2009-11-06 16:30:48 +00:00
Nicolas Pierron
e07f1e98db
* Revert 18115, 18150, 18135, 18112, 18107-18105.
...
Revert modifications done on apache-httpd configurations.
svn path=/nixos/trunk/; revision=18215
2009-11-06 16:23:25 +00:00
Marco Maggesi
ae23b68ee8
Add configurations for MIT kerberos.
...
svn path=/nixos/trunk/; revision=18203
2009-11-06 12:58:44 +00:00
Eelco Dolstra
124096e418
* Remember the original symbolic driver name.
...
svn path=/nixos/trunk/; revision=18185
2009-11-06 09:22:00 +00:00
Eelco Dolstra
194a24bcf1
* Support a `system' argument for if you want to do hacky things like
...
change a NixOS installation from x86_64-linux to i686-linux (or vice
versa if you have distributed builds enabled - I used this upgrade
from 32-bit to 64-bit NixOS).
svn path=/nixos/trunk/; revision=18177
2009-11-06 01:00:44 +00:00
Eelco Dolstra
3e9665dd96
* X server autoconfiguration. Rather than specifying a fixed video
...
driver (in services.xserver.videoDriver), the X server is now given
a set of drivers, and will use PCI ids to find the right one.
The only problem is that the choice of OpenGL driver (the
/var/run/opengl-driver symlink) depends on what driver is selected
at runtime (i.e. the NVIDIA implementation for "nvidia", and Mesa
for all other drivers). However this isn't a big problem right now
since "nvidia" isn't included in the default set of drivers anyway
for legal reasons.
* `services.xserver.resolutions' now defaults to [], meaning that the
X server should figure out the desired resolution(s) itself.
Likewise, `services.xserver.defaultDepth' defaults to 0 to let the X
server figure it out.
* Removed some options from xorg.conf that no longer appear needed
("Composite" and the DRI "Mode").
svn path=/nixos/trunk/; revision=18176
2009-11-06 00:59:03 +00:00
Lluís Batlle i Rossell
fe1f084728
Adding a new xorg driver: unichrome
...
svn path=/nixos/trunk/; revision=18163
2009-11-05 21:35:36 +00:00
Nicolas Pierron
72f804c9b2
* Fix subversion test and change the name of the "config" option to
...
"configuration" because it may interfered with sub-modules keywords.
svn path=/nixos/trunk/; revision=18155
2009-11-05 19:24:02 +00:00
Nicolas Pierron
ca00f6f3f8
* Fix nix-build errors of tests.
...
svn path=/nixos/trunk/; revision=18151
2009-11-05 18:21:09 +00:00
Nicolas Pierron
7571055ad3
* Declare options for sub-services.
...
* Add deprecated options for "serviceType", "serviceName", "function" and
"config" without changing the behavior.
svn path=/nixos/trunk/; revision=18150
2009-11-05 18:21:03 +00:00
Nicolas Pierron
1952365a51
* Remove unused subservice syntax.
...
svn path=/nixos/trunk/; revision=18135
2009-11-05 13:34:01 +00:00
Eelco Dolstra
8dd4147548
* Removed an empty directory.
...
svn path=/nixos/trunk/; revision=18130
2009-11-05 10:28:25 +00:00
Eelco Dolstra
ad17a6dce3
* Changes related to the xorg-7.5 merge.
...
svn path=/nixos/trunk/; revision=18126
2009-11-04 22:44:40 +00:00
Eelco Dolstra
3f7eb694a9
* CUPS provides a dbus service.
...
svn path=/nixos/trunk/; revision=18125
2009-11-04 22:44:21 +00:00
Nicolas Pierron
8734b7103e
* Remove needs to call getPort to access the server port. This is made
...
possible by using sub-modules arguments.
svn path=/nixos/trunk/; revision=18112
2009-11-04 18:14:42 +00:00
Nicolas Pierron
0e22df1587
* Use sub-modules for httpd virtual hosts. This add documentation entries
...
and allow non-intrusive extensions of virtual hosts.
svn path=/nixos/trunk/; revision=18107
2009-11-04 17:00:53 +00:00
Nicolas Pierron
ff1d9969fb
* re-indent per-server-options.nix content.
...
svn path=/nixos/trunk/; revision=18106
2009-11-04 17:00:48 +00:00
Nicolas Pierron
063224bc84
* Convert per-server-options into a module.
...
svn path=/nixos/trunk/; revision=18105
2009-11-04 17:00:42 +00:00
Sander van der Burg
46558b31a0
Added ejabberd to the systemPackages and fixed some command line arguments. This will make the ejabberd service working again
...
svn path=/nixos/trunk/; revision=18070
2009-11-02 12:13:09 +00:00
Nicolas Pierron
8c5b200164
* boor.loader.grub.device can only be defined once.
...
* Replace an obscure piece of code by its equivalent based on the
recursiveUpdate function. Undefined the obsolete name of
boot.grubDevice to avoid conflicts.
svn path=/nixos/trunk/; revision=18049
2009-10-30 11:57:23 +00:00
Eelco Dolstra
b86e8208d5
* Doh! The mount options weren't passed properly.
...
svn path=/nixos/trunk/; revision=18047
2009-10-30 08:49:35 +00:00
Eelco Dolstra
11022e8d9f
* Back out r17946 and 17948 because it doesn't work. I've seen it
...
fail to update /etc twice now. It's also unnecessarily complex
IMHO (see nix-dev).
svn path=/nixos/trunk/; revision=18045
2009-10-30 08:37:08 +00:00
Nicolas Pierron
35c14bb11a
* Add a test to avoid regression of (NIXOS-85).
...
svn path=/nixos/trunk/; revision=17979
2009-10-27 19:19:48 +00:00
Nicolas Pierron
c195493a32
* Add a hacky for-loop to fix the usage of the continue keyword. (NIXOS-85)
...
The continue keyword was previously used to mount the next device, but
the loop in has been removed. (see r17919)
svn path=/nixos/trunk/; revision=17973
2009-10-27 10:45:18 +00:00
Nicolas Pierron
f656741395
Manual: Update nixos-checkout comments.
...
svn path=/nixos/trunk/; revision=17955
2009-10-26 09:50:33 +00:00
Michael Raskin
ca6f5e6cd4
Further reducing writes on boot.. Do not copy /etc unless it changed
...
svn path=/nixos/trunk/; revision=17948
2009-10-24 00:03:13 +00:00
Michael Raskin
893f13bb14
Some boot optimisations attempted. My system boots a few times faster now, and I cannot see how these can break things.
...
svn path=/nixos/trunk/; revision=17946
2009-10-23 20:30:12 +00:00
Marc Weber
4f006e49bf
openvpn was broken by jobAttrs. fixed
...
svn path=/nixos/trunk/; revision=17940
2009-10-23 11:30:54 +00:00
Sander van der Burg
ac5bc4a68a
Added XDMCP option to KDM
...
svn path=/nixos/trunk/; revision=17938
2009-10-23 10:54:35 +00:00
Rob Vermaas
5103c7a872
list possible logformats for apache and added example
...
svn path=/nixos/trunk/; revision=17929
2009-10-22 17:37:06 +00:00
Rob Vermaas
9e80ca48cb
added option to specify logformat to apache httpd, defaults to common (like it was until now)
...
svn path=/nixos/trunk/; revision=17923
2009-10-22 14:36:54 +00:00
Eelco Dolstra
1e1ae9cd1e
* Don't squeeze all the filesystem option values into one environment
...
variable, since they might get confused (NIXOS-84).
svn path=/nixos/trunk/; revision=17919
2009-10-22 07:46:30 +00:00
Eelco Dolstra
feeff52285
* Ugly hack to get HAL to start at boot time. Sometimes it fails
...
without any error message in the log (maybe ConsoleKit related?).
svn path=/nixos/trunk/; revision=17907
2009-10-21 09:41:32 +00:00
Michael Raskin
35abca4e7a
Forward-port sshd fixes to iso-minimal-fresh-kernel. By the way, maybe we should finalyy decide what to do with kernel update and corresponding ISO update (to fresh-kernel proposal or otherwise)
...
svn path=/nixos/trunk/; revision=17840
2009-10-16 04:27:59 +00:00
Marc Weber
fceadcbef7
--redo -> --fast
...
svn path=/nixos/trunk/; revision=17839
2009-10-15 23:39:57 +00:00