Commit graph

259 commits

Author SHA1 Message Date
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
Sander van der Burg 6c8bae53c1 Added PermitRootLogin option for sshd
svn path=/nixos/trunk/; revision=11121
2008-03-14 12:53:14 +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
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 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 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 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 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
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
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
Eelco Dolstra 705c2d36db svn path=/nixos/trunk/; revision=10777 2008-02-20 12:54:17 +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
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 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
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 8bf1cade68 * New-style Subversion server configuration.
svn path=/nixos/trunk/; revision=10508
2008-02-05 16:25:07 +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 9802ed58ee * hardware-scan: load modules for all supported USB devices
automatically.  Of course this should be triggered when
  a USB device is plugged in (from udev).

svn path=/nixos/trunk/; revision=10451
2008-02-01 21:50:29 +00:00