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
Tobias Hammerschmidt
228792a70d
updated svn repositories
...
svn path=/nixos/trunk/; revision=11721
2008-04-25 20:28:39 +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
f2598a9ca5
* In ssmtp, keep the From line if set explicitly in a mail.
...
svn path=/nixos/trunk/; revision=11706
2008-04-24 12:36:50 +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
036e00a16d
* Don't add nssModulePath when it's empty, because then we get
...
an empty element in the LD_LIBRARY_PATH, which means search
for libraries in the current directory.
svn path=/nixos/trunk/; revision=11545
2008-04-10 12:14:15 +00:00
Eelco Dolstra
10cc22203e
* No longer needed.
...
svn path=/nixos/trunk/; revision=11538
2008-04-10 09:14:55 +00:00
Eelco Dolstra
99480990f6
* Added ncurses to the system path (mostly for the "clear" and "reset" commands).
...
svn path=/nixos/trunk/; revision=11528
2008-04-10 07:43:49 +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
Michael Raskin
2c7d02288f
Let us have ddrescue on rescue disks. Like umbrella. Having it reduces chances of its use - and this is very good.
...
svn path=/nixos/trunk/; revision=11322
2008-03-28 12:01:59 +00:00
Michael Raskin
8fcba9ffaa
Shamelessly added xfs and jfs support utilities to a pair of disk images
...
svn path=/nixos/trunk/; revision=11317
2008-03-28 08:06:07 +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
Ludovic Courtès
1a75f0a5a8
Add nssModules' to
systemPathsList', add /lib' to
systemPath', and
...
add `/var/run/current-system/sw/lib' to `LD_LIBRARY_PATH'. This should allow
NSS modules to be added and taken into account by applications without
the need to reboot.
svn path=/nixos/trunk/; revision=11290
2008-03-26 16:23:52 +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
dc27e80fad
Changes to support swsusp and custom kernels.
...
svn path=/nixos/trunk/; revision=11272
2008-03-24 19:37:32 +00:00
Michael Raskin
9ab654a6c4
Fix regexp to determine xserver and dbus correctly
...
svn path=/nixos/trunk/; revision=11265
2008-03-22 18:53:55 +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
Eelco Dolstra
d6e1828c13
* Speed up activating the configuration: don't do a find
...
on all of /etc, skip /etc/nixos. (Actually, the NixOS/Nixpkgs
sources probably shouldn't be stored in /etc...)
svn path=/nixos/trunk/; revision=11261
2008-03-22 16:04:38 +00:00
Eelco Dolstra
249fc3c135
* Fix weird "systemConfig=blabla" errors due to wrong parsing
...
of the resume= kernel parameter.
svn path=/nixos/trunk/; revision=11260
2008-03-22 16:03:43 +00:00
Eelco Dolstra
5d7f0e7967
* Suppress some errors if tuxonice isn't loaded.
...
svn path=/nixos/trunk/; revision=11259
2008-03-22 16:02:57 +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
047241dd5d
* When restarting a job, *really* wait until the job has
...
stopped before starting it again.
svn path=/nixos/trunk/; revision=11232
2008-03-20 14:44:36 +00:00
Eelco Dolstra
2cc2831563
* Indentation.
...
svn path=/nixos/trunk/; revision=11231
2008-03-20 14:38:49 +00:00
Eelco Dolstra
e32a8437d5
svn path=/nixos/trunk/; revision=11203
2008-03-19 12:58:14 +00:00
Ludovic Courtès
79ffaeb2e7
activate-configuration: Look for setuid executables in the default profile.
...
svn path=/nixos/trunk/; revision=11202
2008-03-19 12:34:39 +00:00
Ludovic Courtès
3a973ab55c
nixos-rebuild: Determine $NIXPKGS' from
$NIXOS' by default.
...
svn path=/nixos/trunk/; revision=11200
2008-03-19 12:27:30 +00:00
Eelco Dolstra
473d75fc46
* Typo.
...
svn path=/nixos/trunk/; revision=11199
2008-03-19 12:21:09 +00:00
Ludovic Courtès
d1f29d328d
Add support for `nss-mdns'.
...
Currently, the solution is a bit hackish since running applications
will not work after a `nixos-rebuild' because `libnss_mdns' is not
in their `LD_LIBRARY_PATH'.
svn path=/nixos/trunk/; revision=11162
2008-03-17 13:58:57 +00:00
Ludovic Courtès
7390b6e5bd
Build /etc/rpc' from Glibc, used by
rpcinfo(1)', for instance.
...
svn path=/nixos/trunk/; revision=11159
2008-03-17 12:33:21 +00:00
Eelco Dolstra
52aed402db
* Moved to Nixpkgs.
...
svn path=/nixos/trunk/; revision=11155
2008-03-17 10:51:09 +00:00
Ludovic Courtès
6354623143
Add known setuid programs to the path' variable passed to
activate-configuration'.
...
This is really a hack since programs not known to `system.nix' will not be in the path
of `activate-configuration', which consequently creates empty `.real' files under
`/var/setuid-wrappers'. I don't know what the best way to address this is: let admins
write `.real' files by hand? Add a `setuidPackages' attribute, listing the names of
packages that contain the binaries listed in `setuidPrograms'?
svn path=/nixos/trunk/; revision=11153
2008-03-17 10:31:40 +00:00
Ludovic Courtès
5568ef6e8d
activate-configuration: Report it if a setuid program was not found.
...
svn path=/nixos/trunk/; revision=11152
2008-03-17 10:11:48 +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
Ludovic Courtès
5229399617
setuid-wrapper: Disallow empty `.real' files.
...
svn path=/nixos/trunk/; revision=11122
2008-03-14 13:10:30 +00:00