Ludovic Courtès
fe51b0c6c3
bashrc: Source `${bash}/etc/bash_completion' when available.
...
svn path=/nixos/trunk/; revision=16641
2009-08-10 10:18:33 +00:00
Ludovic Courtès
4c848efc1a
bashrc: Remove obsolete aclocal' and
rpcgen' hacks.
...
svn path=/nixos/trunk/; revision=16640
2009-08-10 10:07:30 +00:00
Ludovic Courtès
ac29ad197b
stage-1-init: Remove timeout from `fail()'.
...
Timeouts upon failure can be harmful, e.g., after a file system failure
that needs manual intervention.
svn path=/nixos/trunk/; revision=16637
2009-08-10 09:20:05 +00:00
Sander van der Burg
8c034b988d
Added a lot of modifications in order to expression a Tomcat configuration better and to perform more efficient management of various Tomcat components.
...
With these modifications, a user can configure a tomcat instance with web applications and web services by writing a service, such as:
...
services = {
tomcat = {
enable = true;
webapps = [ mypkgs.HelloWorldWebApplication ];
axis2 = {
enable = true;
services = [ mypkgs.HelloService mypkgs.HelloWorldService ];
};
};
};
svn path=/nixos/trunk/; revision=16619
2009-08-09 20:19:07 +00:00
Eelco Dolstra
a9071b3283
svn path=/nixos/branches/modular-nixos/; revision=16592
2009-08-05 14:43:13 +00:00
Eelco Dolstra
02c119a104
* Workaround for hangs on x86_64.
...
svn path=/nixos/branches/modular-nixos/; revision=16590
2009-08-05 11:43:51 +00:00
Eelco Dolstra
7d3e2b15ef
svn path=/nixos/branches/modular-nixos/; revision=16585
2009-08-04 16:09:07 +00:00
Eelco Dolstra
32bb5b2d0f
* Bring back the options to enable/disable the Intel firmwares.
...
svn path=/nixos/branches/modular-nixos/; revision=16574
2009-08-04 08:50:02 +00:00
Michael Raskin
c8705704e1
Add Wacom X11 driver support
...
svn path=/nixos/branches/modular-nixos/; revision=16569
2009-08-03 19:55:33 +00:00
Eelco Dolstra
383370f782
* Don't create a temporary file in $HOME.
...
svn path=/nixos/branches/modular-nixos/; revision=16561
2009-08-03 12:44:45 +00:00
Eelco Dolstra
6802a75076
* nixos-rebuild: replaced some environment variables with options
...
(e.g. --install-grub instead of $NIXOS_INSTALL_GRUB). Also support
some nix-build options (e.g. --show-trace and -j).
svn path=/nixos/branches/modular-nixos/; revision=16560
2009-08-03 12:36:15 +00:00
Eelco Dolstra
bc54061cba
svn path=/nixos/branches/modular-nixos/; revision=16557
2009-08-03 12:17:23 +00:00
Michael Raskin
137ce0907c
Some fixes in on-boot activation
...
svn path=/nixos/branches/modular-nixos/; revision=16525
2009-07-31 08:32:53 +00:00
Michael Raskin
f05682c84d
Give some progress indications during Stage2 boot
...
svn path=/nixos/branches/modular-nixos/; revision=16523
2009-07-31 04:56:52 +00:00
Michael Raskin
bef1dc8bd5
Update RC kernel for rescue CD: includes some BtrFS fixes
...
svn path=/nixos/branches/modular-nixos/; revision=16515
2009-07-30 04:20:56 +00:00
Michael Raskin
6aba79bed5
Update child configuration generation
...
svn path=/nixos/branches/modular-nixos/; revision=16514
2009-07-30 04:20:23 +00:00
Rob Vermaas
9c05dd98dc
intel5000 firmware
...
svn path=/nixos/branches/modular-nixos/; revision=16473
2009-07-27 14:08:14 +00:00
Eelco Dolstra
f0f5434eaa
* Add an option to enable the firewall. It should eventually be
...
enabled by default.
svn path=/nixos/branches/modular-nixos/; revision=16464
2009-07-26 21:27:35 +00:00
Eelco Dolstra
264b49fce7
* A very basic firewall that rejects all incoming connections except
...
for the ports defined in networking.firewall.allowedTCPPorts.
svn path=/nixos/branches/modular-nixos/; revision=16460
2009-07-24 23:12:52 +00:00
Eelco Dolstra
38d594deec
* wpa_supplicant: start/stop automatically.
...
svn path=/nixos/branches/modular-nixos/; revision=16451
2009-07-24 00:31:42 +00:00
Eelco Dolstra
c4780a8953
* dhcp 4.1 requires IPv6 support.
...
svn path=/nixos/branches/modular-nixos/; revision=16450
2009-07-24 00:31:22 +00:00
Eelco Dolstra
32b311a0f5
* Add gzip to the $PATH of nix-daemon, otherwise distributed builds
...
don't work. This is a regression wrt the trunk.
svn path=/nixos/branches/modular-nixos/; revision=16448
2009-07-23 23:25:50 +00:00
Marc Weber
dbd6ea7f63
adding daemonNiceLevel option. running biulds with niceness 0 can be annoying
...
svn path=/nixos/branches/modular-nixos/; revision=16420
2009-07-18 16:14:03 +00:00
Eelco Dolstra
d591559609
* A simple module for running wpa_supplicant.
...
svn path=/nixos/branches/modular-nixos/; revision=16409
2009-07-16 21:08:32 +00:00
Eelco Dolstra
3abf509637
* Don't try to start dhclient on the wmaster0 interface. This just
...
gets rid of endless dhclient log messages such as
Jul 16 19:09:30 dutibo dhclient: DHCPDISCOVER on wmaster0 to 255.255.255.255 port 67 interval 19
Jul 16 19:09:30 dutibo dhclient: send_packet: Network is down
svn path=/nixos/branches/modular-nixos/; revision=16407
2009-07-16 17:25:50 +00:00
Eelco Dolstra
b58682401e
* Give a type to networking.interfaces.
...
* Simplified the pre-start script of the network-interfaces module.
* Removed wireless support from the network-interfaces module. It
only worked for static WEP configurations anyway, and AFAIK nobody
used it.
svn path=/nixos/branches/modular-nixos/; revision=16406
2009-07-16 17:18:54 +00:00
Eelco Dolstra
f53c9d70ec
* The lack of a newline at the end of "EnableSendFile Off" caused a
...
broken httpd.conf to be generated. We should really have a merge
function that appends newlines to every value of options like
services.httpd.extraConfig.
svn path=/nixos/branches/modular-nixos/; revision=16404
2009-07-16 16:13:35 +00:00
Eelco Dolstra
2cd3e205f4
svn path=/nixos/branches/modular-nixos/; revision=16397
2009-07-16 15:01:56 +00:00
Eelco Dolstra
6119c399d8
* Support tasks in the new Upstart formalism.
...
* Swap task: fixed removing disabled swap devices.
* Swap task: specified the type of swapDevices.
svn path=/nixos/branches/modular-nixos/; revision=16396
2009-07-16 14:51:49 +00:00
Eelco Dolstra
7cb4503ad6
* More Upstart refactoring.
...
svn path=/nixos/branches/modular-nixos/; revision=16394
2009-07-16 13:55:11 +00:00
Eelco Dolstra
bb292fdf04
* Support post-stop actions.
...
svn path=/nixos/branches/modular-nixos/; revision=16393
2009-07-16 13:46:49 +00:00
Michael Raskin
8f7b33c87d
I thought squashfs would not require loop.ko
...
svn path=/nixos/branches/modular-nixos/; revision=16388
2009-07-16 10:28:58 +00:00
Michael Raskin
fac9d09941
Oops, forgot FS modules
...
svn path=/nixos/branches/modular-nixos/; revision=16387
2009-07-16 10:06:53 +00:00
Michael Raskin
e155a46516
Forgot all-module fixes for the correct booting in rescue CD
...
svn path=/nixos/branches/modular-nixos/; revision=16386
2009-07-16 09:48:22 +00:00
Michael Raskin
a7f24fd4bb
Trying to build a good rescue CD..
...
svn path=/nixos/branches/modular-nixos/; revision=16385
2009-07-16 09:22:40 +00:00
Eelco Dolstra
889311f4ca
* Refactored the sshd module.
...
svn path=/nixos/branches/modular-nixos/; revision=16377
2009-07-15 15:53:39 +00:00
Eelco Dolstra
c45cf3a28e
* In the jobs attribute, support a more high-level way of specifying
...
jobs, e.g. (from the nscd job)
{ name = "nscd";
description = "Name Service Cache Daemon";
startOn = "startup";
stopOn = "shutdown";
environment = { LD_LIBRARY_PATH = nssModulesPath; };
preStart =
''
mkdir -m 0755 -p /var/run/nscd
mkdir -m 0755 -p /var/db/nscd
'';
exec = "${pkgs.glibc}/sbin/nscd -f ${./nscd.conf} -d 2> /dev/null";
};
The Upstart job is generated from this. The main goal is to provide
some abstraction from the Upstart syntax. For instance, this should
make it easier to upgrade to newer versions of Upstart, to switch to
an entirely different process management system (e.g. initng or
launchd), or to test a job independantly from Upstart. (However the
startOn and stopOn attributes are tied to Upstart's event model.)
svn path=/nixos/branches/modular-nixos/; revision=16376
2009-07-15 15:24:11 +00:00
Eelco Dolstra
0e3bef4195
* Declare the type of jobs.
...
svn path=/nixos/branches/modular-nixos/; revision=16375
2009-07-15 13:41:00 +00:00
Eelco Dolstra
f076849acd
* Escape strings.
...
svn path=/nixos/branches/modular-nixos/; revision=16374
2009-07-15 13:40:30 +00:00
Eelco Dolstra
1424399002
* Simplify.
...
svn path=/nixos/branches/modular-nixos/; revision=16373
2009-07-15 12:52:32 +00:00
Eelco Dolstra
96fe3ba1b7
* Inline make-job.nix.
...
svn path=/nixos/branches/modular-nixos/; revision=16372
2009-07-15 11:38:17 +00:00
Eelco Dolstra
9d1e31117f
* Get rid of the "users" and "groups" fields in jobs.
...
svn path=/nixos/branches/modular-nixos/; revision=16371
2009-07-15 11:34:55 +00:00
Eelco Dolstra
ca8e00cafa
* Got rid of the extraPath field in jobs (use
...
environment.systemPackages instead). Also renamed
services.extraJobs to jobs.
svn path=/nixos/branches/modular-nixos/; revision=16370
2009-07-15 11:19:11 +00:00
Eelco Dolstra
def0be732f
* job.extraHttpdConfig: not used anywhere.
...
svn path=/nixos/branches/modular-nixos/; revision=16369
2009-07-15 09:14:24 +00:00
Eelco Dolstra
118418ba31
* Refactoring the Upstart module. Got rid of job.extraEtc, it's
...
redundant now (modules can just define environment.etc).
svn path=/nixos/branches/modular-nixos/; revision=16367
2009-07-15 09:06:36 +00:00
Eelco Dolstra
b66fd2364c
* Don't put /etc/nixos/nixos in ~/.nix-defexpr.
...
svn path=/nixos/branches/modular-nixos/; revision=16366
2009-07-15 08:45:29 +00:00
Eelco Dolstra
da996583ee
* Include the NixOS manpages in the system environment. Actually
...
there is only one currently: configuration.nix(5), which contains a
list of all the options.
svn path=/nixos/branches/modular-nixos/; revision=16360
2009-07-14 16:27:46 +00:00
Eelco Dolstra
896a9f0508
* Generate a manual page for configuration.nix containing all the
...
options.
svn path=/nixos/branches/modular-nixos/; revision=16358
2009-07-14 15:47:03 +00:00
Eelco Dolstra
a27f3942ef
* Callouts require the docbook_xsl images.
...
svn path=/nixos/branches/modular-nixos/; revision=16354
2009-07-14 13:31:32 +00:00
Eelco Dolstra
ab1676b457
* Urgh, this should have been in commit r16350.
...
svn path=/nixos/branches/modular-nixos/; revision=16353
2009-07-14 13:28:50 +00:00