Commit Graph

282 Commits

Author SHA1 Message Date
Marc Weber
fdc63c54e4 enhance phpIni documentation
readd r19267 (the issue should be fixed now)

Eelco Dolstra and Nicolas Pierron both kept asking me to pay attention
to the rendered manual. There is one catch: example settings such as
pkgs.kernelPackages_2_6_25 are correct however they don't render
properly. Moreover you don't want those examples to be evaluated (maybe
compiling a kernel ?) when building the manual only.
So use Strings and add a copy & paste note.
This is still a hacky. Maybe a kind of typed "verbatim" expression
should be added (?)

svn path=/nixos/trunk/; revision=19281
2010-01-07 09:01:40 +00:00
Eelco Dolstra
ac7c404deb * Revert r19267 - it causes a corrupt Apache Upstart job to be
generated.  E.g. in
  http://hydra.nixos.org/build/208321/nixlog/8/raw:

    webserver# init:/etc/init/httpd.conf:14: Unexpected token

svn path=/nixos/trunk/; revision=19280
2010-01-06 23:37:30 +00:00
Marc Weber
99644df67a customizable PHPRC
svn path=/nixos/trunk/; revision=19267
2010-01-06 17:05:57 +00:00
Eelco Dolstra
73668f41da * Added an "auto" pseudo display manager that logs in a user
automatically.  This is mostly useful for testing.  (KDM also has
  this feature, but it's nice not to depend on KDE for non-KDE tests.)

svn path=/nixos/trunk/; revision=19239
2010-01-05 15:32:14 +00:00
Eelco Dolstra
62476f2816 * Added a module for IceWM.
svn path=/nixos/trunk/; revision=19238
2010-01-05 15:30:56 +00:00
Marc Weber
c0c4d575d2 autofs job fixes:
use exec so that upstart knows when automount shuts down.
If a mount is used upstart will send SIGKILL.
Automount doesn't clean up. So unmount everything using a post script.

svn path=/nixos/trunk/; revision=19105
2009-12-25 06:39:43 +00:00
Lluís Batlle i Rossell
aaac043ae5 Making an explicit dependency for nfs-kernel on portmap
svn path=/nixos/trunk/; revision=19090
2009-12-24 12:05:34 +00:00
Eelco Dolstra
9c465fedfa * Reinstate the -s flag.
svn path=/nixos/trunk/; revision=19055
2009-12-20 22:03:32 +00:00
Eelco Dolstra
57f70db611 * Revert r19003 for now, because wpa_supplicant 0.6.9 (in the Nixpkgs
trunk) doesn't have a -s flag.  0.7.0 in the stdenv branch
  presumably does, but it's marked as unstable upstream.

svn path=/nixos/trunk/; revision=19047
2009-12-20 16:51:22 +00:00
Lluís Batlle i Rossell
3f6ca96967 Adding an option to disable nscd.
svn path=/nixos/trunk/; revision=19004
2009-12-16 20:51:25 +00:00
Lluís Batlle i Rossell
ee434cc3d6 Using wpa_supplicant feature to log to syslog, instead of stdout (which,
in the actual upstart job, meant /dev/console)

svn path=/nixos/trunk/; revision=19003
2009-12-16 19:45:19 +00:00
Lluís Batlle i Rossell
4e8270f695 Upstart considers that syslog is ready (runs openlog())
after the connection to dbus worked.
So I set dbus depend also on syslogd.

svn path=/nixos/trunk/; revision=19002
2009-12-16 19:45:11 +00:00
Rob Vermaas
48d5ea1077 mysql.mysql becomes mysql.package because eelco likes it better
svn path=/nixos/trunk/; revision=18994
2009-12-16 15:24:15 +00:00
Rob Vermaas
52284859c5 * allow configuration of mysql version
svn path=/nixos/trunk/; revision=18993
2009-12-16 14:54:36 +00:00
Michael Raskin
b628ca221d Fix Monit upstart dependency
svn path=/nixos/trunk/; revision=18964
2009-12-15 13:32:10 +00:00
Ludovic Courtès
3f2348ef91 Start networking services on `ip-up' when it makes sense.
svn path=/nixos/trunk/; revision=18962
2009-12-15 13:02:23 +00:00
Rob Vermaas
fe490f2edc * mysql-backup: option for which user to use for performing backups
svn path=/nixos/trunk/; revision=18942
2009-12-14 17:57:37 +00:00
Marc Weber
4d7e344f69 Adding initial version of the nixos cd insallation test script using
qemu_kvm. Installation doesn't take place yet. VM is started
printing a remote controlled "Hello".

This serves as example how to run a vm within a bulid job.

svn path=/nixos/trunk/; revision=18887
2009-12-11 00:51:13 +00:00
Rob Vermaas
038180bab8 * sshd.nix: ports attribute, to allow listening to multiple ports
svn path=/nixos/trunk/; revision=18877
2009-12-10 14:45:41 +00:00
Eelco Dolstra
9682f0ed90 svn path=/nixos/trunk/; revision=18872 2009-12-10 09:22:45 +00:00
Lluís Batlle i Rossell
60b856b115 Adding a module for system health monitoring (getting graphs generated by rrdtool
of usual system counters).
It sets up some cron jobs for collecting the data, and not that often, generating the
graphs. Then the httpd server is configured with a directory with the generated
static files.

http://www.brianlane.com/software/systemhealth/

svn path=/nixos/trunk/; revision=18866
2009-12-09 21:45:59 +00:00
Lluís Batlle i Rossell
b005e22952 Adding a not-very-nice option to allow setting the wpa_supplicant interface.
(eth1 in my PC, instead of the previously hardcoded wlan0)

svn path=/nixos/trunk/; revision=18862
2009-12-09 20:30:40 +00:00
Nicolas Pierron
05c23802bb Fix synergy client.
* Add serverAddress option.
* Evaluate the client daemon in foreground, otherwise upstart get the hand
  and tries to restart it.

svn path=/nixos/trunk/; revision=18799
2009-12-04 12:50:49 +00:00
Nicolas Pierron
f4a6f9e84b * Add options to handle automatic calls to the garbage collector.
These options avoid manual references to pkgs.nixUnstable which might be
  changed with environment.nix option.

svn path=/nixos/trunk/; revision=18798
2009-12-04 12:50:44 +00:00
Eelco Dolstra
4eabed3f0f * Support short URLs (http://server/wiki/Page instead of
http://server/w/index.php?title=Page).

svn path=/nixos/trunk/; revision=18783
2009-12-03 13:34:36 +00:00
Eelco Dolstra
aacd16cff0 * Make various MediaWiki scripts available in $PATH,
e.g. mediawiki-<id>-changePassword (where <id> is usually "main").

svn path=/nixos/trunk/; revision=18780
2009-12-03 12:20:24 +00:00
Eelco Dolstra
9f8fc09fc3 * Create a user "mediawiki" and give root and wwwrun ident-based
access.

svn path=/nixos/trunk/; revision=18779
2009-12-03 11:56:03 +00:00
Eelco Dolstra
c7e0a7b31c * Make it configurable.
svn path=/nixos/trunk/; revision=18778
2009-12-03 08:44:54 +00:00
Eelco Dolstra
81c3454cdb * Allow Mediawiki (and other PHP applications) to send email through
the `sendmail' command (i.e. ssmtp).  This is hacky - there should
  be some global config value that specifies the path to sendmail,
  which the ssmtp module and others can then set.

svn path=/nixos/trunk/; revision=18777
2009-12-03 08:25:16 +00:00
Eelco Dolstra
f99d9b0658 * Basic MediaWiki module. Thanks to Dario Vodopivec, Milan Seneši and
Nasir Shadravan.

svn path=/nixos/trunk/; revision=18769
2009-12-02 17:59:17 +00:00
Eelco Dolstra
d29072d214 * Generate a postgresql.conf and use it to specify the paths to
pg_hba.conf and pg_ident.conf.
* Turn on syslog logging for PostgreSQL.

svn path=/nixos/trunk/; revision=18768
2009-12-02 17:18:25 +00:00
Marco Maggesi
729bf2e2f0 Fix wrong upstart directives in openafs-client
svn path=/nixos/trunk/; revision=18645
2009-11-26 14:12:19 +00:00
Marco Maggesi
7cefe762db Fix openafs-client for the new Upstart 0.6
svn path=/nixos/trunk/; revision=18644
2009-11-26 13:11:56 +00:00
Eelco Dolstra
ed6daf4ea4 * Doh! I lost ${flags} somewhere along the way, so Postgres
wouldn't get the -i option anymore...

svn path=/nixos/branches/upstart-0.6/; revision=18606
2009-11-24 17:07:23 +00:00
Eelco Dolstra
a21f18e81f * Synced with the trunk.
svn path=/nixos/branches/upstart-0.6/; revision=18602
2009-11-24 16:11:01 +00:00
Eelco Dolstra
e76f14714b svn path=/nixos/trunk/; revision=18599 2009-11-24 15:05:08 +00:00
Eelco Dolstra
88b26c47ad * Run cronjobs with a more userfriendly $PATH.
svn path=/nixos/trunk/; revision=18595
2009-11-24 14:20:33 +00:00
Sander van der Burg
ff177a01a7 Fixed ejabberd service so that it will be started on startup
svn path=/nixos/branches/upstart-0.6/; revision=18557
2009-11-23 13:29:47 +00:00
Sander van der Burg
7fc40ca2f1 Enabled startOn event of the MySQL and Tomcat server so that they are initialised on startup
svn path=/nixos/branches/upstart-0.6/; revision=18556
2009-11-23 13:26:33 +00:00
Michael Raskin
69a2842d01 Switch off one of the two conflicting on-by-default options
svn path=/nixos/trunk/; revision=18519
2009-11-22 14:34:53 +00:00
Ludovic Courtès
1966f9d297 Hopefully really fix the OpenSSH/GnuPG agent assertion (yes!).
svn path=/nixos/trunk/; revision=18517
2009-11-22 00:54:01 +00:00
Ludovic Courtès
d912b510f5 Hopefully really fix the OpenSSH/GnuPG agent assertion.
svn path=/nixos/trunk/; revision=18516
2009-11-22 00:46:37 +00:00
Ludovic Courtès
ab3332a2eb Rename startSSHAgent' to startOpenSSHAgent'.
svn path=/nixos/trunk/; revision=18515
2009-11-22 00:40:53 +00:00
Ludovic Courtès
8c349a9e71 Fix the OpenSSH/GnuPG agent assertion.
svn path=/nixos/trunk/; revision=18514
2009-11-22 00:40:48 +00:00
Ludovic Courtès
66d8af6d09 X: Add support for starting the GnuPG agent.
svn path=/nixos/trunk/; revision=18509
2009-11-21 22:14:01 +00:00
Sander van der Burg
2c8d2c2268 Small bugfix which automatically creates tomcat configuration dirs. Otherwise the startup would fail
svn path=/nixos/branches/upstart-0.6/; revision=18488
2009-11-20 16:20:57 +00:00
Sander van der Burg
ebbde6f8d3 Added directory option for ejabberd dumps so that we can use derivations on a convenient way, e.g. loadDumps = [ myDumpDrvFun ];
svn path=/nixos/branches/upstart-0.6/; revision=18487
2009-11-20 15:35:01 +00:00
Sander van der Burg
dd0f8b36d5 Moved ejabberd initialization check loop inside the if statement, since we only have to check for it in the first startup
svn path=/nixos/branches/upstart-0.6/; revision=18464
2009-11-19 15:17:04 +00:00
Sander van der Burg
9b000b3dcf Added loadDumps option, which makes it possible to load a specific ejabberd configuration on the first startup
svn path=/nixos/branches/upstart-0.6/; revision=18461
2009-11-19 15:12:05 +00:00
Sander van der Burg
a5cdfcbdb2 Removed the dirty sleep hack from the ejabberd service
svn path=/nixos/branches/upstart-0.6/; revision=18456
2009-11-19 13:15:15 +00:00