Commit graph

284 commits

Author SHA1 Message Date
Eelco Dolstra
5d5f48af83 * Some robots blocks.
svn path=/nixos/trunk/; revision=11762
2008-05-06 08:04:28 +00:00
Marc Weber
7a7582ec01 * added extraModules apache configuration option
Eelco, can your review this patch ?
I hope it fits your design - if not revert it
This way we can drop the mod_php option (See example)

svn path=/nixos/trunk/; revision=11734
2008-04-27 23:56:51 +00:00
Michael Raskin
7ee619f83d Typo fix & NameVirtualHost generation
svn path=/nixos/trunk/; revision=11710
2008-04-24 18:32:05 +00:00
Eelco Dolstra
5dbe45bfea * Modified the SSL configuration a bit. Instead of having a httpPort
and a httpsPort, there are now options "port" and "enableSSL".  So
  to get https you should typically set up a vhost like this:

    virtualHosts = [
      { hostName = "foo.example.org";
        enableSSL = true;
        sslServerCert = "...";
        sslServerKey = "...";
      }
    ];

* sslServerCert and sslServerKey can be set per vhost.  This is
  currently only useful when doing IP-based vhosting.

* enableUserDir is now a per-vhost setting, as it should be.

* Convenience option globalRedirect to redirect the entire host to
  some URL.

svn path=/nixos/trunk/; revision=11704
2008-04-24 11:56:38 +00:00
Eelco Dolstra
10bdceaaad * Allow disambiguation between the admin scripts of multiple
Subversion service instances.

svn path=/nixos/trunk/; revision=11701
2008-04-24 11:42:50 +00:00
Eelco Dolstra
fc236567c2 * Forgot to add (even though the twiki config is not general enough yet).
svn path=/nixos/trunk/; revision=11700
2008-04-24 11:40:11 +00:00
Nicolas Pierron
38874d8025 Add options to hide the cursor and define the default user.
svn path=/nixos/trunk/; revision=11664
2008-04-21 13:05:35 +00:00
Michael Raskin
8fd2404adf Lots of fixes to Apache HTTPD configuration. Net result: I can have SSL-only SVN repository on :12443 and SSL-enabled http server with userDirs.
svn path=/nixos/trunk/; revision=11660
2008-04-19 10:21:42 +00:00
Michael Raskin
02decddeb1 Added possibility to use names instead of full paths in httpd subservices. Yes, the same dirty hack again
svn path=/nixos/trunk/; revision=11615
2008-04-13 09:35:18 +00:00
Michael Raskin
5e1ee10f3c HTTPS support in httpd upstart job fixed.
svn path=/nixos/trunk/; revision=11613
2008-04-12 20:08:35 +00:00
Michael Raskin
bfa0e51ee5 Added possibility to modify Xorg passed to upstart-job and xlaunch
svn path=/nixos/trunk/; revision=11555
2008-04-11 09:20:39 +00:00
Eelco Dolstra
10cc22203e * No longer needed.
svn path=/nixos/trunk/; revision=11538
2008-04-10 09:14:55 +00:00
Michael Raskin
8c4ebbd24a Some tweaks for Gateway6 job
svn path=/nixos/trunk/; revision=11496
2008-04-08 21:41:01 +00:00
Eelco Dolstra
3979844e22 * Purify syslog.conf (it doesn't have to be in /etc).
svn path=/nixos/trunk/; revision=11436
2008-04-01 12:50:47 +00:00
Ludovic Courtès
a0fc21eda3 Add `atd' Upstart job.
svn path=/nixos/trunk/; revision=11435
2008-04-01 10:16:35 +00:00
Ludovic Courtès
3957962cf9 BitlBee: Run as bitlbee' instead of root'.
svn path=/nixos/trunk/; revision=11292
2008-03-26 16:42:57 +00:00
Ludovic Courtès
f9cbd6e640 avahi-daemon: Start on `network-interfaces/started'.
svn path=/nixos/trunk/; revision=11291
2008-03-26 16:41:31 +00:00
Tobias Hammerschmidt
6ce57e3117 use new ForkDaemon mode (introduced in bitlbee 1.2) instead of Daemon mode
svn path=/nixos/trunk/; revision=11284
2008-03-26 07:42:44 +00:00
Marc Weber
3b603a2281 synergyc ip last arg fix
svn path=/nixos/trunk/; revision=11280
2008-03-25 00:14:05 +00:00
Marc Weber
0fbd66414a enhanced error reporting missing config attr (new job proposal)
svn path=/nixos/trunk/; revision=11279
2008-03-25 00:06:58 +00:00
Michael Raskin
060533c8a1 Fixes to OpenFire
svn path=/nixos/trunk/; revision=11264
2008-03-22 17:54:13 +00:00
Eelco Dolstra
3703cd13a2 * Quick hack to make HAL start properly.
svn path=/nixos/trunk/; revision=11262
2008-03-22 16:05:01 +00:00
Marc Weber
3afeae0c00 tightvnc service (there might still be some things to improve.. I can run it - has xfs check :)
svn path=/nixos/trunk/; revision=11243
2008-03-20 18:34:14 +00:00
Eelco Dolstra
2cc2831563 * Indentation.
svn path=/nixos/trunk/; revision=11231
2008-03-20 14:38:49 +00:00
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
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