Commit graph

1036 commits

Author SHA1 Message Date
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
Michael Raskin
0d5c0f946f Moved module list in a separat eexpression for easier maintenance
svn path=/nixos/trunk/; revision=10885
2008-02-28 12:10:05 +00:00
Michael Raskin
e4215fe020 Updates to LiveDVD
svn path=/nixos/trunk/; revision=10884
2008-02-28 11:42:53 +00:00
Michael Raskin
3e2ed65cf9 Fixed rescue-cd-configurable.nix
svn path=/nixos/trunk/; revision=10883
2008-02-28 10:19:27 +00:00
Michael Raskin
4b8b296c30 Some changes (at least wipe resume image securely even without TuxOnIce)
svn path=/nixos/trunk/; revision=10881
2008-02-28 09:59:01 +00:00
Eelco Dolstra
c4617e5b04 svn path=/nixos/trunk/; revision=10853 2008-02-25 13:30:23 +00:00
Eelco Dolstra
d5c09f9b61 * Clear args (NIXPKGS-86).
svn path=/nixos/trunk/; revision=10852
2008-02-25 13:20:00 +00:00
Eelco Dolstra
3dcd0cc7a4 * stdenvUsingSetupNew2 -> stdenv.
svn path=/nixos/trunk/; revision=10850
2008-02-25 12:43:38 +00:00
Michael Raskin
59ea75d88e !!! Important notice. This commit should be already done at the time of nixpkgs-stdenv-updates-merge going to trunk. This commit should be reverted if you are using old nixpkgs trunk. I hope there will be no commits to nixos/ before merger...
svn path=/nixos/trunk/; revision=10824
2008-02-22 03:08:26 +00:00
Ludovic Courtès
b81baa3e9a Revert `$EMACSLOADPATH' trick: it doesn't work because the value
of `$EMACSLOADPATH' overrides Emacs's default `load-path', which
contains useful directories like `$EMACS/share/emacs/22.1/lisp',
etc.

svn path=/nixos/trunk/; revision=10792
2008-02-20 22:58:50 +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
ebea2dafa1 * Quick hack to get the old Apache job working.
svn path=/nixos/trunk/; revision=10785
2008-02-20 17:03:48 +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
Eelco Dolstra
705c2d36db svn path=/nixos/trunk/; revision=10777 2008-02-20 12:54:17 +00:00
Ludovic Courtès
724ff442ba Export `$EMACSLOADPATH'.
svn path=/nixos/trunk/; revision=10768
2008-02-20 10:35:49 +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
Eelco Dolstra
8b165fc1f4 * Allow subservices to declare a script that will be run before
the server start.  Useful to initialise necessary state.

svn path=/nixos/trunk/; revision=10761
2008-02-19 17:37:05 +00:00
Eelco Dolstra
5d2435d460 * Top-level redirect to the repoman.
svn path=/nixos/trunk/; revision=10758
2008-02-19 16:52:24 +00:00
Eelco Dolstra
20881fe84b * Indentation.
svn path=/nixos/trunk/; revision=10757
2008-02-19 16:52:08 +00:00
Eelco Dolstra
a2c20a9d29 * Virtual hosts: inherit adminAddr from the main server.
svn path=/nixos/trunk/; revision=10756
2008-02-19 14:54:19 +00:00
Eelco Dolstra
d7dd9179ce * Allow aliases for each virtual host.
svn path=/nixos/trunk/; revision=10754
2008-02-19 14:41:20 +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
bbbef0f2fa * extraDirectores -> extraConfig.
svn path=/nixos/trunk/; revision=10731
2008-02-18 15:00:26 +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
a9281eae63 * Put the static files for the Subversion service in a separate directory.
svn path=/nixos/trunk/; revision=10697
2008-02-14 20:59:04 +00:00
Eelco Dolstra
7563d6e144 svn path=/nixos/trunk/; revision=10693 2008-02-14 20:14:57 +00:00
Eelco Dolstra
a06b51f895 svn path=/nixos/trunk/; revision=10692 2008-02-14 19:47:17 +00:00
Eelco Dolstra
ffd96f07fe svn path=/nixos/trunk/; revision=10689 2008-02-14 14:29:21 +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
44fceb9c4d svn path=/nixos/trunk/; revision=10686 2008-02-14 13:37:09 +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
Ludovic Courtès
bfbe92236a Remove remaining `abort ()'.
svn path=/nixos/trunk/; revision=10680
2008-02-14 11:44:54 +00:00
Ludovic Courtès
bdc729ea6c Use assert (!C)' instead of if (C) abort ();' in setuid wrappers.
svn path=/nixos/trunk/; revision=10679
2008-02-14 11:08:06 +00:00
Eelco Dolstra
a05d842575 * Close fdSelf.
svn path=/nixos/trunk/; revision=10678
2008-02-14 10:56:14 +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
Ludovic Courtès
33f34e2092 Don't define ASPELL_EXTRA_DICT_DIRS', use ASPELL_CONF' instead.
svn path=/nixos/trunk/; revision=10673
2008-02-14 09:41:34 +00:00
Eelco Dolstra
18123c08ca * Refactoring.
svn path=/nixos/trunk/; revision=10671
2008-02-14 07:42:52 +00:00
Eelco Dolstra
6e06b11097 svn path=/nixos/trunk/; revision=10643 2008-02-12 12:56:39 +00:00
Eelco Dolstra
eca9242918 svn path=/nixos/trunk/; revision=10624 2008-02-11 11:51:51 +00:00
Eelco Dolstra
666d0bde09 * Disable modules missing on x86_64.
svn path=/nixos/trunk/; revision=10563
2008-02-08 23:51:43 +00:00
Eelco Dolstra
0efc29afa4 * Manual updates.
svn path=/nixos/trunk/; revision=10560
2008-02-08 22:43:59 +00:00
Michael Raskin
c21ba2d99e Created expression to keep in sync with rescue-cd.nix; I do not want to make creating smaller CD images more difficult.
svn path=/nixos/trunk/; revision=10559
2008-02-08 19:31:41 +00:00
Michael Raskin
067db8fa72 Modifications to nixos-checkout for multi-branch support.
svn path=/nixos/trunk/; revision=10558
2008-02-08 19:13:29 +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