Commit Graph

868 Commits

Author SHA1 Message Date
Marc Weber
465a66ab3f renamed newProposal directory
added two example jobs

svn path=/nixos/trunk/; revision=11146
2008-03-16 15:52:52 +00:00
Marc Weber
e4757b33b1 removed trace lines, Thanks raskin
svn path=/nixos/trunk/; revision=11144
2008-03-16 11:03:03 +00:00
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
Ludovic Courtès
5229399617 setuid-wrapper: Disallow empty `.real' files.
svn path=/nixos/trunk/; revision=11122
2008-03-14 13:10:30 +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
95d41d5e27 * Allow the location of Nixpkgs to be specified through $NIXPKGS.
* $NIXOS_NO_PULL: changed to $NIXOS_PULL (which should be set to "0"
  to disable pulling).
* New variable $NIXOS_BUILD_NIX, which can be set to "0" to disable
  building nixUnstable from Nixpkgs.

svn path=/nixos/trunk/; revision=11096
2008-03-13 10:17:42 +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
Sander van der Burg
5005c49e45 Added forgotten documentRoot variable
svn path=/nixos/trunk/; revision=11081
2008-03-12 12:21:12 +00:00
Eelco Dolstra
1b89e8a55b * Write a partial ordering of modules to $out/insmod-list (for when we
don't have modprobe in the initrd).

svn path=/nixos/trunk/; revision=11079
2008-03-12 12:16:32 +00:00
Sander van der Burg
1e5f26537d Fixed PS1 to show a # for the root-user
svn path=/nixos/trunk/; revision=11077
2008-03-12 11:18:43 +00:00
Sander van der Burg
7c93a71468 Added bashrc files to make dircolors/prompt working on xterm/konsole etc.
svn path=/nixos/trunk/; revision=11073
2008-03-12 10:18:26 +00:00
Sander van der Burg
9ffb0e8ec4 Added bashrc files to make dircolors/prompt working on xterm/konsole etc.
svn path=/nixos/trunk/; revision=11072
2008-03-12 10:18:11 +00:00
Michael Raskin
b615a392a2 Some updates to Live DVD building
svn path=/nixos/trunk/; revision=11044
2008-03-10 20:19:33 +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
Nicolas Pierron
5240c13bd2 * Enable halting and rebooting with slim. (type halt or reboot as login and the root password)
svn path=/nixos/trunk/; revision=11040
2008-03-10 17:27:37 +00:00
Ludovic Courtès
37eaa53007 Add handy rpcgen' alias in /etc/profile'.
svn path=/nixos/trunk/; revision=11013
2008-03-07 13:06:40 +00:00
Ludovic Courtès
9650b0859e Fix `avahi-daemon' Upstart job.
svn path=/nixos/trunk/; revision=11002
2008-03-06 20:56:50 +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
ad1b5aca82 Set $ACLOCAL_PATH' in /etc/profile'.
This variable is not honored by `aclocal' itself but by the wrapper that's
installed for `aclocal' by the `automake' package.

svn path=/nixos/trunk/; revision=10990
2008-03-06 14:56:10 +00:00
Ludovic Courtès
2b1a2d2415 Add PAM config file for `lsh-pam-checkpw'.
svn path=/nixos/trunk/; revision=10989
2008-03-06 14:49:06 +00:00
Ludovic Courtès
c0dc904b90 Add a PAM config file for lshd (doesn't seem to work, though).
svn path=/nixos/trunk/; revision=10988
2008-03-06 14:38:17 +00:00
Eelco Dolstra
f2b3ff2fce * PAM config for xlock.
svn path=/nixos/trunk/; revision=10987
2008-03-06 13:52:10 +00:00
Ludovic Courtès
89f86847f6 Setup $PKG_CONFIG_PATH' in /etc/profile'.
svn path=/nixos/trunk/; revision=10971
2008-03-05 19:26:15 +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
e48a01523f Gateway6 upstart job update.
svn path=/nixos/trunk/; revision=10953
2008-03-04 15:30:54 +00:00
Eelco Dolstra
65deea6610 * dbus-uuidgen is now in dbus.tools. Also, a quick hack to get
DBus clients working again: they expect dbus-launch in the 
  dbus.daemon prefix, where it no longer is.  Fortunately they
  also search in the path.  But a better fix is to move dbus-launch
  to dbus.daemon.

svn path=/nixos/trunk/; revision=10951
2008-03-04 14:58:48 +00:00
Eelco Dolstra
8b98c3b125 svn path=/nixos/trunk/; revision=10947 2008-03-04 13:37:52 +00:00
Michael Raskin
6a84e72db6 Added nixos-gen-seccure-keys to nixosTools
svn path=/nixos/trunk/; revision=10937
2008-03-03 23:32:17 +00:00
Michael Raskin
4b31843e64 Added nixos-gen-seccure-keys and modified nixos-checkout to store /etc/nixos/version.nix with string representing checkout version.
svn path=/nixos/trunk/; revision=10936
2008-03-03 23:31:48 +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
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