Marc Weber
40d9d62879
added mkOption extraConfig for httpd apache service
...
( added \n in config concatenation as well )
added serviceProposal, examples see upstart-jobs/newProposal/*.nix
enhancement: everything belonging to one job is within the same file
(was: upstart-jobs/default.nix, options.nix and the job file)
drawback: options won't be included within the manual
(can be fixed see comments in options.nix)
comment: looking at the funtion newProposalJobs maybe it's overkill?
Hope it pays off if we start having dozens of small different services..
svn path=/nixos/trunk/; revision=11141
2008-03-16 01:05:40 +00:00
Ludovic Courtès
cf16b3acfe
Add `portmap' job.
...
svn path=/nixos/trunk/; revision=11140
2008-03-15 23:40:44 +00:00
Sander van der Burg
6c8bae53c1
Added PermitRootLogin option for sshd
...
svn path=/nixos/trunk/; revision=11121
2008-03-14 12:53:14 +00:00
Eelco Dolstra
8389cc378a
* Hack: don't restart dbus automatically, it kills the X server.
...
Apparantly the cause was not the upgrade to DBus 1.1.20 but
something else.
svn path=/nixos/trunk/; revision=11095
2008-03-13 10:15:12 +00:00
Nicolas Pierron
58240dc30d
Add the option xkbModel in the xserver.
...
svn path=/nixos/trunk/; revision=11041
2008-03-10 17:33:13 +00:00
Ludovic Courtès
43a4353c67
Add support for the Avahi daemon.
...
The daemon starts correctly but, for some reason, clients fail
to connect to it.
svn path=/nixos/trunk/; revision=10999
2008-03-06 17:11:22 +00:00
Ludovic Courtès
3cde6bd187
Add support for lshd (SSH2 daemon of GNU lsh).
...
svn path=/nixos/trunk/; revision=10969
2008-03-05 16:03:09 +00:00
Michael Raskin
cf28e6d341
MS Core Fonts are now optional
...
svn path=/nixos/trunk/; revision=10962
2008-03-05 14:30:19 +00:00
Michael Raskin
cedc8aaf58
Now public key is copied to store (and its hash affects derivation hash)
...
svn path=/nixos/trunk/; revision=10954
2008-03-04 16:06:33 +00:00
Michael Raskin
6d07b2a545
Added seccureUser to default environment (it is the encryption tool I hope to use for configuration files), made checkConfigurationOptions on by default, added nixos-gen-seccure-keys to nixosTools
...
svn path=/nixos/trunk/; revision=10935
2008-03-03 23:30:49 +00:00
Michael Raskin
c0dd88a973
Added openfire upstart job. Note: after enabling it first time, go 127.0.0.1:9090 to configure it!
...
svn path=/nixos/trunk/; revision=10930
2008-03-03 19:28:10 +00:00
Michael Raskin
16a8462820
Changed FontDir to also handle TTF.
...
svn path=/nixos/trunk/; revision=10912
2008-03-02 18:46:57 +00:00
Ludovic Courtès
17d527a540
Fix typo related to BitlBee.
...
svn path=/nixos/trunk/; revision=10791
2008-02-20 22:46:53 +00:00
Eelco Dolstra
50800ad3b5
svn path=/nixos/trunk/; revision=10781
2008-02-20 13:29:08 +00:00
Ludovic Courtès
063fd9eeb6
Install BitlBee if enabled.
...
svn path=/nixos/trunk/; revision=10780
2008-02-20 13:18:41 +00:00
Tobias Hammerschmidt
672d293c2b
Added support for the Zydas zd1211 firmware.
...
svn path=/nixos/trunk/; revision=10763
2008-02-20 09:01:26 +00:00
Ludovic Courtès
5122633592
Add support for Intel's 4965AGN firmware.
...
svn path=/nixos/trunk/; revision=10735
2008-02-18 16:50:08 +00:00
Eelco Dolstra
8a1d362447
* Postgres job: start postgres directly, don't use the old control
...
script from the services tree.
svn path=/nixos/trunk/; revision=10722
2008-02-18 11:56:43 +00:00
Ludovic Courtès
b98cb9a770
Add BitlBee Upstart job in deamon mode.
...
svn path=/nixos/trunk/; revision=10720
2008-02-18 09:15:10 +00:00
Eelco Dolstra
b9d01830d3
* In a vhost, merge in the robots.txt for the main server.
...
svn path=/nixos/trunk/; revision=10688
2008-02-14 14:14:39 +00:00
Eelco Dolstra
94937ba2aa
* Support for declaring virtual hosts, like
...
httpd = {
...
virtualHosts = [
{ hostName = "foo";
documentRoot = "/data/webroot-foo";
...
}
{ hostName = "bar";
documentRoot = "/data/webroot-bar";
...
}
];
};
Each virtual host can specify almost any option also permitted in
the top-level httpd configuration.
svn path=/nixos/trunk/; revision=10682
2008-02-14 13:20:26 +00:00
Eelco Dolstra
f6fce91cb2
* Allow httpd subservices to declare options locally.
...
* Allow multiple instantiations of a subservice (for instance,
multiple Subversion subservices in the same Apache server).
svn path=/nixos/trunk/; revision=10675
2008-02-14 09:54:25 +00:00
Eelco Dolstra
18123c08ca
* Refactoring.
...
svn path=/nixos/trunk/; revision=10671
2008-02-14 07:42:52 +00:00
Eelco Dolstra
0efc29afa4
* Manual updates.
...
svn path=/nixos/trunk/; revision=10560
2008-02-08 22:43:59 +00:00
Eelco Dolstra
ce250ffb37
* Installation CD: include a lot of modules (SATA, PATA, Firewire,
...
USB, some SCSI controllers) in the initrd for mounting the CD.
* Add nix-hardware-scan to the system.
* Upstart: don't use the -v flag.
* Include the NixOS version in the ISO image filename.
* Include testdisk and ms-sys in the CD.
* Some bugfixes in the installer.
svn path=/nixos/trunk/; revision=10556
2008-02-08 15:59:15 +00:00
Eelco Dolstra
1f81bcae40
svn path=/nixos/trunk/; revision=10548
2008-02-07 14:39:32 +00:00
Eelco Dolstra
b510189674
svn path=/nixos/trunk/; revision=10545
2008-02-07 14:15:13 +00:00
Sander van der Burg
390d2adb91
Modified variable names to follow the standard convention
...
svn path=/nixos/trunk/; revision=10544
2008-02-07 14:02:38 +00:00
Sander van der Burg
7fad8dc1b9
Changed some variable names to follow the standard convention
...
svn path=/nixos/trunk/; revision=10542
2008-02-07 13:37:20 +00:00
Sander van der Burg
76897682c4
Added vsftpd upstart job
...
svn path=/nixos/trunk/; revision=10540
2008-02-07 12:41:18 +00:00
Eelco Dolstra
65c1f9882c
* Less verbosity.
...
svn path=/nixos/trunk/; revision=10506
2008-02-05 14:33:21 +00:00
Sander van der Burg
90f34e204d
Added ejabberd service
...
svn path=/nixos/trunk/; revision=10495
2008-02-04 13:40:01 +00:00
Eelco Dolstra
707e515f82
* Option to enable support for the WIS GO7007.
...
svn path=/nixos/trunk/; revision=10491
2008-02-04 10:52:58 +00:00
Eelco Dolstra
c30e7b0f13
* Determine networking.enableIntel3945ABGFirmware.
...
svn path=/nixos/trunk/; revision=10490
2008-02-04 10:39:06 +00:00
Eelco Dolstra
0d50031a0a
* Periodically update the locate database from cron when
...
config.services.locate.enable is set.
svn path=/nixos/trunk/; revision=10448
2008-02-01 12:35:51 +00:00
Eelco Dolstra
9f62e1a6a5
* Declarative specification of the system cron jobs. Ideally
...
this would abstract over the Crontab syntax though.
svn path=/nixos/trunk/; revision=10447
2008-02-01 12:01:27 +00:00
Sander van der Burg
406d3aafc5
Added deploydir to tomcat service
...
svn path=/nixos/trunk/; revision=10407
2008-01-30 14:38:27 +00:00
Sander van der Burg
b3ff0f8a59
Added tomcat service to NixOS
...
svn path=/nixos/trunk/; revision=10402
2008-01-30 11:00:00 +00:00
Eelco Dolstra
9fd5d70968
* The CD is now a true live CD: you can run Nix operations in it
...
thanks to unionfs. For instance, nix-env and nixos-rebuild work.
The tricky part was to build a Nix database (in the tmpfs/unionfs)
which is now necessary to prevent store paths on the CD from being
deleted right away because they otherwise wouldn't be valid.
* nixos-install: use the /etc/nixos/configuration.nix from the target
file system (don't copy it anymore). Since the user is supposed to
mount the target file system on /mnt anyway, we may as well require
that configuration.nix is placed in /mnt/etc/nixos. This also makes
upgrading / reinstalling much easier, since it will automatically
use the right configuration.nix.
svn path=/nixos/trunk/; revision=10399
2008-01-30 01:28:56 +00:00
Eelco Dolstra
34e63da53b
* Make nixUnstable the default again.
...
svn path=/nixos/trunk/; revision=10398
2008-01-30 01:14:03 +00:00
Eelco Dolstra
2da50038e4
* Use aufs instead of unionfs, it seems to be more stable.
...
svn path=/nixos/trunk/; revision=10390
2008-01-29 18:53:15 +00:00
Michael Raskin
6f0772d9f0
JBoss job fix
...
svn path=/nixos/trunk/; revision=10367
2008-01-28 20:04:48 +00:00
Sander van der Burg
6e96e0a87d
Fixed syntax error
...
svn path=/nixos/trunk/; revision=10311
2008-01-28 15:44:59 +00:00
Sander van der Burg
1727c4bd3b
Added mod_jk module to apache httpd
...
svn path=/nixos/trunk/; revision=10310
2008-01-28 15:40:29 +00:00
Sander van der Burg
8d5884e01f
Added JBoss service
...
svn path=/nixos/trunk/; revision=10309
2008-01-28 15:16:14 +00:00
Sander van der Burg
4341ef80d8
Fixed MySQL option
...
svn path=/nixos/trunk/; revision=10307
2008-01-28 14:55:12 +00:00
Sander van der Burg
a73c26875a
Added MySQL service to NixOS
...
svn path=/nixos/trunk/; revision=10305
2008-01-28 14:30:18 +00:00
Michael Raskin
e5025996ca
fontDir compatible with both trunk and (hopefully) stdenv-updates
...
svn path=/nixos/trunk/; revision=10293
2008-01-25 13:31:59 +00:00
Yury G. Kudryashov
e914d28638
Using default stdenv in fontdir.nix
...
svn path=/nixos/trunk/; revision=10289
2008-01-25 12:54:32 +00:00
Yury G. Kudryashov
3166d9f687
Made iwlwifi optional, with false default
...
svn path=/nixos/trunk/; revision=10288
2008-01-25 12:54:27 +00:00