d5f3418507
Added guestUsers job for automatical adding guests
...
svn path=/nixos/branches/fix-style/; revision=14160
2009-02-22 16:06:52 +00:00
f824a1e753
Added rogue job used by CD
...
svn path=/nixos/branches/fix-style/; revision=14159
2009-02-22 16:06:47 +00:00
b1eabe2b1b
An upstart job to display manual
...
svn path=/nixos/branches/fix-style/; revision=14158
2009-02-22 16:06:42 +00:00
311ff6c8e7
* Set KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS in bashrc. This has
...
the advantage that KDE applications work when logging in via ssh,
and that you don't need to logout to have KDE upgrades take effect.
On the downside, since the various KDE packages and shared-mime-info
all have their own MIME databases, if we put them in one symlink
tree (systemPath), we need to rerun update-mime-database on the
symlink tree. Also, systemPath is getting very large.
svn path=/nixos/trunk/; revision=14148
2009-02-20 16:31:42 +00:00
049c60e8c0
* Quick hack to make sure that acpid starts before hal.
...
svn path=/nixos/trunk/; revision=14139
2009-02-20 15:11:07 +00:00
c87f67bd28
* Support for KDE 4.2. Set services.xserver.sessionType to "kde4" to
...
enable. It looks great ;-)
svn path=/nixos/trunk/; revision=14089
2009-02-16 23:53:18 +00:00
4dacbc3c79
* Generate the acpid configuration properly: each config file
...
can only contain one event.
svn path=/nixos/trunk/; revision=14080
2009-02-13 18:55:38 +00:00
03e7f296b1
* acpid: switch to the ondemand CPU scaling governer when on battery power.
...
Disabled acpid by default because it's not configurable enough yet.
svn path=/nixos/trunk/; revision=14070
2009-02-13 12:11:42 +00:00
cf7fcb98ec
* Suspend when the laptop lid is closed.
...
svn path=/nixos/trunk/; revision=14038
2009-02-11 23:15:07 +00:00
c83a185090
* Run the ACPI daemon. This allows the system to respond to ACPI
...
events, like pressing the power button. The NVIDIA X11 driver also
needs it to respond to the internal/external monitor switch button
on laptops. The power actions should of course be made
configurable.
svn path=/nixos/trunk/; revision=14027
2009-02-10 23:25:49 +00:00
059ca080b1
Making the 'via' video module available in the xserver upstart-job.
...
svn path=/nixos/trunk/; revision=13939
2009-02-01 21:23:31 +00:00
d98f482739
* Start mingetty after udev, otherwise /dev/tty* may not exist yet
...
(and you get Upstart messages about the ttyN job being restarted).
svn path=/nixos/trunk/; revision=13931
2009-02-01 19:51:53 +00:00
d641e99375
PulseAudio Upstart job: honor `enable'.
...
svn path=/nixos/trunk/; revision=13926
2009-02-01 18:35:56 +00:00
2b8216bdda
Add Upstart job for PulseAudio as a system-wide daemon.
...
svn path=/nixos/trunk/; revision=13907
2009-01-29 18:28:09 +00:00
a3f778c23d
* CUPS: use /etc/cups rather than ${cups}/etc/cups as the ServerRoot,
...
because CUPS modifies files in the ServerRoot directory. Most
importantly, it stores printer configuration there. Previously the
CUPS server modified the files under ${cups}/etc/cups, which is
impure and caused all configured printers to disappear any time CUPS
was upgraded.
svn path=/nixos/trunk/; revision=13892
2009-01-28 14:48:37 +00:00
016e4dc5c3
Increased the sleep hack on the Tomcat service
...
svn path=/nixos/trunk/; revision=13890
2009-01-28 12:19:42 +00:00
7ac9e76eb6
Some fixes to the Apache Tomcat connector
...
svn path=/nixos/trunk/; revision=13879
2009-01-27 13:02:56 +00:00
ecc761543c
Remove name argument of merge functions.
...
svn path=/nixos/branches/fix-style/; revision=13860
2009-01-25 15:49:23 +00:00
dcc981840e
Use the mergeOneOption function instead of duplicated code.
...
svn path=/nixos/branches/fix-style/; revision=13859
2009-01-25 15:49:18 +00:00
b2b6f92d6b
Split xserver upstart job into:
...
- xserver configuration & job
- display manager (slim)
- window manager (compiz, kwm, metacity, twm, wmii, xmonad)
- desktop manager (kde, gnome, xterm)
Added features:
- Add WM choice in slim (with F1)
svn path=/nixos/branches/fix-style/; revision=13857
2009-01-25 15:49:08 +00:00
fa3437cb35
Remove enableIntel* and enableGo7007 options.
...
Update nixos-hardware-scan.pl to generate files without these options.
svn path=/nixos/branches/fix-style/; revision=13856
2009-01-25 15:48:59 +00:00
67edd3720f
Update argument syntax of configuration files.
...
svn path=/nixos/branches/fix-style/; revision=13852
2009-01-25 15:48:39 +00:00
08280c415f
Add support for wmii.
...
svn path=/nixos/branches/fix-style/; revision=13850
2009-01-25 15:48:30 +00:00
b92036e803
Fetch the windows manager pid.
...
svn path=/nixos/branches/fix-style/; revision=13849
2009-01-25 15:48:25 +00:00
348afe7dc6
Replace old argument syntax.
...
svn path=/nixos/trunk/; revision=13848
2009-01-25 15:26:46 +00:00
61aa32f174
Update argument syntax of configuration files.
...
svn path=/nixos/trunk/; revision=13847
2009-01-25 15:22:17 +00:00
788275e47c
* Remove a stale lock file that may prevent the
...
X server from starting.
svn path=/nixos/trunk/; revision=13812
2009-01-20 08:44:41 +00:00
93c19c4ae9
* CUPS daemon: modprobe usblp so that CUPS can find USB printers.
...
* CUPS daemon: use Ghostscript to support printing on non-Postscript
printers.
svn path=/nixos/trunk/; revision=13794
2009-01-17 13:10:06 +00:00
e50e022fc6
Added Apache Tomcat proxy to new Apache upstart service
...
svn path=/nixos/trunk/; revision=13786
2009-01-16 14:07:54 +00:00
fbe40a260e
* The Linux kernel >= 2.6.27 provides firmware, so add it to the
...
firmware search path.
svn path=/nixos/trunk/; revision=13770
2009-01-15 10:35:00 +00:00
12f4fbfb4b
Added guestUsers job for automatical adding guests
...
svn path=/nixos/trunk/; revision=13732
2009-01-09 00:23:07 +00:00
9a46e71e7b
Added rogue job used by CD
...
svn path=/nixos/trunk/; revision=13730
2009-01-08 23:49:22 +00:00
0a1f41c742
An upstart job to display manual
...
svn path=/nixos/trunk/; revision=13728
2009-01-08 23:30:23 +00:00
7aa27dfee2
Merge branches 'fix-style' and 'master' into fix-style
...
svn path=/nixos/branches/fix-style/; revision=13688
2009-01-02 19:41:39 +00:00
d745c21aab
Merge system/fontdir.nix and system/fonts.nix into a new configuration file.
...
svn path=/nixos/branches/fix-style/; revision=13686
2009-01-02 16:07:39 +00:00
1b32260084
Convert "upstart-jobs/xserver.nix" to a configuration file.
...
svn path=/nixos/branches/fix-style/; revision=13682
2009-01-02 16:07:21 +00:00
79bfab0e07
convert "upstart-jobs/atd.nix" to a configuration file. Remove extra occurrences of "atd" from other files.
...
svn path=/nixos/branches/fix-style/; revision=13680
2009-01-02 16:07:10 +00:00
c787cb1a0a
Replace job tags by a library of function to build upstart jobs.
...
svn path=/nixos/branches/fix-style/; revision=13674
2009-01-02 16:06:41 +00:00
d8c1734b99
Synaptics two-finger scrolling option
...
svn path=/nixos/trunk/; revision=13663
2008-12-20 14:29:52 +00:00
b47e6675b8
Use generated upstart-job's tags for cron.
...
svn path=/nixos/branches/fix-style/; revision=13593
2008-12-07 12:27:46 +00:00
2f0e8e370a
Update argument style.
...
svn path=/nixos/branches/fix-style/; revision=13584
2008-12-04 15:48:27 +00:00
8373c890a8
atd: Make `at' and friends actually usable by regular users.
...
This patch makes the `at' commands setuid `atd' (instead of `root')
and fixes the ownership of `/etc/at/at.deny'.
svn path=/nixos/trunk/; revision=13515
2008-11-29 17:36:00 +00:00
730244f13d
lshd: Use `lsh-pam-checkpw' as the password helper program.
...
This finally allows users to log in using password authentication.
svn path=/nixos/trunk/; revision=13490
2008-11-28 15:44:15 +00:00
d02e581192
fix: FCRON should no longer be build by default
...
svn path=/nixos/trunk/; revision=13436
2008-11-26 14:38:35 +00:00
be02b8a87a
Use `iwlwifi4965ucode' from `kernelPackages'.
...
svn path=/nixos/trunk/; revision=13430
2008-11-26 13:16:59 +00:00
9fefbf1379
add ifEnable to fcron job
...
svn path=/nixos/trunk/; revision=13383
2008-11-24 09:07:28 +00:00
1236cf61f4
replace ifEnable by mkIf and mkThenElse.
...
svn path=/nixos/branches/fix-style/; revision=13382
2008-11-23 01:29:25 +00:00
157bb2b71a
Convert "alsa" upstart-job to the fix-style.
...
svn path=/nixos/branches/fix-style/; revision=13379
2008-11-23 01:29:05 +00:00
9c0eef3bae
Convert "dbus" & "avahi-deamon" upstart-job to the fix-style.
...
svn path=/nixos/branches/fix-style/; revision=13378
2008-11-23 01:28:58 +00:00
dc634f5297
Convert "hal" upstart-job to the fix-style.
...
svn path=/nixos/branches/fix-style/; revision=13377
2008-11-23 01:28:52 +00:00
585fd9d911
Convert "gpm" upstart-job to the fix-style.
...
svn path=/nixos/branches/fix-style/; revision=13376
2008-11-23 01:28:45 +00:00
afe160c6b2
Convert "nagios" upstart-job to the fix-style.
...
svn path=/nixos/branches/fix-style/; revision=13375
2008-11-23 01:28:34 +00:00
a63ea50ee9
Fix zabbix-server.nix.
...
svn path=/nixos/branches/fix-style/; revision=13374
2008-11-23 01:28:25 +00:00
eea7e6c213
adding fcron daemon.
...
I have only tested it with upstart 0.5, maybe you have to fix small things in the job description
svn path=/nixos/trunk/; revision=13369
2008-11-22 17:05:20 +00:00
80377e512e
added sshd GatwayPorts option
...
svn path=/nixos/trunk/; revision=13363
2008-11-20 23:47:05 +00:00
9c751d377d
Use the new scheme for zabbix upstart-job.
...
svn path=/nixos/branches/fix-style/; revision=13329
2008-11-18 18:00:21 +00:00
3a25babf1b
Use the new scheme for disnix upstart-job.
...
svn path=/nixos/branches/fix-style/; revision=13328
2008-11-18 18:00:15 +00:00
892d12bccf
- Move some system configuration to options:
...
* system.nssModules
* system.modulesTree
* system.sbin.modprobe
* system.sbin.mount
* nix.envVars
- Remove Arguments that can be accessed either by "config" or "pkgs".
- Use the new scheme for upstart-jobs/default.nix.
This is now a configuration file which is imported by system/options.nix.
- Jobs can now include upstart-job/default.nix:
* upstrat-jobs/cron.nix
* upstart-jobs/dhclient.nix
=> No Nixos file refers to upstart-jobs/default.nix except if one of its options is require to define an extra job. (e.g.: cron, dhclient)
svn path=/nixos/branches/fix-style/; revision=13327
2008-11-18 18:00:09 +00:00
2ed34fae67
Extract "locate" job from the "cron" job.
...
svn path=/nixos/trunk/; revision=13236
2008-11-09 16:44:53 +00:00
866987a60e
cron.nix: Use the new option scheme.
...
svn path=/nixos/trunk/; revision=13235
2008-11-09 16:44:43 +00:00
b73a579d18
Fix previous commit.
...
svn path=/nixos/trunk/; revision=13229
2008-11-08 21:45:58 +00:00
4a55f02005
"dhclient.nix" is now a self-contained job.
...
svn path=/nixos/trunk/; revision=13228
2008-11-08 21:32:48 +00:00
1573bdddfb
* CUPS: enabled support for printing via SMB.
...
svn path=/nixos/trunk/; revision=13218
2008-11-07 13:37:28 +00:00
c76632804c
meta.function -> passthru.function
...
svn path=/nixos/trunk/; revision=13191
2008-11-04 21:24:58 +00:00
f549ee6009
* Always add "iceauth" to the PATH (not just when sessionType ==
...
"kde") so that KDE applications work even when not running KDE.
svn path=/nixos/trunk/; revision=13154
2008-10-29 16:15:58 +00:00
32b263e429
added system cron mailto option
...
svn path=/nixos/trunk/; revision=13114
2008-10-25 22:03:12 +00:00
1d55390e1c
An option for XRandr support. Use it for dualhead ATi (and probably Intel) cards.
...
svn path=/nixos/trunk/; revision=13109
2008-10-24 10:30:38 +00:00
a99b82b987
Misspelling the video driver name results in a thrown message now
...
small refactorings, list of known drivers is an attr set, optional is imported from lib etc
svn path=/nixos/trunk/; revision=13048
2008-10-10 16:45:56 +00:00
5ea24925b5
* Use Subversion 1.5.
...
svn path=/nixos/trunk/; revision=12980
2008-10-06 23:02:20 +00:00
ec1d1ef851
* Urgh, there's got to be a more generic way of dealing
...
with the Python version...
svn path=/nixos/trunk/; revision=12972
2008-10-06 13:40:14 +00:00
77d1d30e97
doh, removed debug statement and superfluous wrong character
...
svn path=/nixos/trunk/; revision=12862
2008-09-14 13:29:09 +00:00
ca031ce720
httpd.extraModules: now accpets string items loading modules beeing distributed by apache
...
removed pkgs : arg
svn path=/nixos/trunk/; revision=12861
2008-09-14 01:30:45 +00:00
d5da3185fe
svn path=/nixos/trunk/; revision=12853
2008-09-12 16:31:39 +00:00
e15ffa9e3c
Add `gnunetd' Upstart job.
...
svn path=/nixos/trunk/; revision=12802
2008-09-04 20:28:02 +00:00
ab80a34ea4
* Quick workaround for tty-backgrounds not working on Linux 2.6.26:
...
/proc/sys/kernel/fbcondecor is now suddenly named /proc/sys/fbcondecor.
Might be a bug.
svn path=/nixos/trunk/; revision=12784
2008-09-02 09:51:44 +00:00
0d3cee6247
Typo fixed
...
svn path=/nixos/trunk/; revision=12757
2008-08-27 21:22:49 +00:00
6e6f867a0a
Add pcmcia job.
...
Test the new option style.
svn path=/nixos/trunk/; revision=12742
2008-08-27 14:01:17 +00:00
1e33c98258
* Doh.
...
svn path=/nixos/trunk/; revision=12737
2008-08-27 10:06:25 +00:00
618b726542
* Don't put the Adobe bitmap fonts in the fontconfig search path
...
because then Helvetica looks horrible.
svn path=/nixos/trunk/; revision=12736
2008-08-27 10:00:49 +00:00
545406b2e2
Added support for ejabberd virtualhosts
...
svn path=/nixos/trunk/; revision=12648
2008-08-18 14:48:55 +00:00
fdc362a726
Fixed a very stupid bug
...
svn path=/nixos/trunk/; revision=12611
2008-08-13 09:44:40 +00:00
c5fea583e2
Added disnix hook options
...
svn path=/nixos/trunk/; revision=12596
2008-08-12 13:16:12 +00:00
4c3627f16e
Added CATALINA_OPTS parameter
...
svn path=/nixos/trunk/; revision=12588
2008-08-11 21:35:45 +00:00
ffe45949e8
* Use the right mount command in the filesystems job so that
...
NTFS-3G works properly.
svn path=/nixos/trunk/; revision=12565
2008-08-09 12:03:08 +00:00
b760a4b8d9
* Use the persistent storage udev rules in the initrd so that we can
...
use /dev/disk/by-{label,id,...} names for the root FS.
* Kill udevd at the end of stage 1. Don't know how it got killed
previously...
svn path=/nixos/trunk/; revision=12560
2008-08-08 22:44:45 +00:00
2e9dc1ea47
Rename option: services.xserver.packageFun -> .package
...
svn path=/nixos/trunk/; revision=12553
2008-08-08 18:57:11 +00:00
51210b1904
Remove pkgs argument of:
...
- boot.kernelPackages
- boot.extraModulePackages
- services.xserver.packageFun (should be renamed)
- fonts.extraFonts
- environment.extraPackages
- environment.nix
These options still accept the previous style.
svn path=/nixos/trunk/; revision=12551
2008-08-08 18:57:07 +00:00
b8ff944cd2
Postfix list separator fix
...
svn path=/nixos/trunk/; revision=12548
2008-08-08 18:51:32 +00:00
014b33637c
Added an option to easily allow everyone to use "at".
...
svn path=/nixos/trunk/; revision=12531
2008-08-07 10:09:17 +00:00
791d8bbc66
Add udev extra option (addUdevPkgs).
...
Add some merge functions.
svn path=/nixos/trunk/; revision=12523
2008-08-06 19:26:47 +00:00
f652a0836a
Added support for custom context.xml
...
svn path=/nixos/trunk/; revision=12513
2008-08-06 15:07:29 +00:00
afdfff7ed8
Added common lib support for tomcat
...
svn path=/nixos/trunk/; revision=12511
2008-08-06 13:41:08 +00:00
cb8067cdb5
More configuratbility for vsFTPd upstart job.
...
svn path=/nixos/trunk/; revision=12472
2008-08-04 09:36:11 +00:00
e40d6858d9
* udev: create symlinks /dev/{cd,dvd,cdrw,dvdrw}.
...
svn path=/nixos/trunk/; revision=12456
2008-07-31 14:13:35 +00:00
5ec1fa2060
* Tabs considered harmful.
...
svn path=/nixos/trunk/; revision=12407
2008-07-23 14:13:27 +00:00
8eb0444ab8
lshd: Explicitly pass all options to the daemon.
...
svn path=/nixos/trunk/; revision=12319
2008-07-08 07:24:28 +00:00
6a2600c0a2
Added some more features to the tomcat service
...
svn path=/nixos/trunk/; revision=12284
2008-07-06 19:55:34 +00:00
82ddadc27c
Added disnix service
...
svn path=/nixos/trunk/; revision=12283
2008-07-06 18:34:19 +00:00
045ae06092
Updated ejabberd service to make it work
...
svn path=/nixos/trunk/; revision=12270
2008-07-06 10:30:53 +00:00
7813be5e54
Updated tomcat service with a more sophisticated model
...
svn path=/nixos/trunk/; revision=12268
2008-07-05 22:27:36 +00:00
2c56d137ee
I hope that hardwareScan = false now works as expected again...
...
svn path=/nixos/trunk/; revision=12253
2008-07-03 18:54:16 +00:00
6ed65c2d95
* Removing hardware-scan.nix also removed the loading of the
...
kernel modules listed in config.boot.kernelModules. So do
that in the udev job for lack of a better place.
svn path=/nixos/trunk/; revision=12249
2008-07-03 10:45:14 +00:00
5f60393ffe
* Let udev call modprobe to load modules for all known hardware. This
...
makes the `hardware-scan' job unnecessary. (In fact the new
approach appears to be more thorough; it loads some drivers that
were not previously loaded.)
svn path=/nixos/trunk/; revision=12248
2008-07-02 21:19:04 +00:00
96cfd4105e
* Revert accidental commit.
...
svn path=/nixos/trunk/; revision=12247
2008-07-02 21:16:29 +00:00
49b9662e31
* Use most of the default rules from the udev distribution
...
rather than supplying our own (less maintenance...).
This takes care, among other things, of populating
/dev/disk, which is useful.
svn path=/nixos/trunk/; revision=12246
2008-07-02 18:06:34 +00:00
ed1029092b
* Udev jobs can now declare a passthru attribute which is
...
useful for testing the building of specific parts of
a service, e.g. you can do
$ nix-build /etc/nixos/nixos/ -A upstartJobs.udev.passthru.udevRules
to build the udev rules directory of the udev service.
svn path=/nixos/trunk/; revision=12243
2008-07-02 18:02:24 +00:00
4d0645acb1
Fixed authoritative zone ACL, enabled IPv6
...
svn path=/nixos/trunk/; revision=12234
2008-07-01 12:31:47 +00:00
7699aaad79
Added BIND
...
svn path=/nixos/trunk/; revision=12233
2008-07-01 12:15:56 +00:00
700fa49f93
Separate dovecot log
...
svn path=/nixos/trunk/; revision=12232
2008-07-01 10:50:38 +00:00
eaf6b8eb18
* udevtrigger / udevsettle -> udevadm.
...
svn path=/nixos/trunk/; revision=12229
2008-07-01 08:28:56 +00:00
fc877a99a7
Silly mistake fixed - chowned maildirs on start
...
svn path=/nixos/trunk/; revision=12225
2008-06-30 21:34:41 +00:00
2025d58c2a
At least dovecot and postfix work together and with Thunderbird
...
svn path=/nixos/trunk/; revision=12223
2008-06-30 21:12:02 +00:00
eb79938997
Added Postfix; handles at least local delivery with maildir/
...
svn path=/nixos/trunk/; revision=12221
2008-06-30 15:13:02 +00:00
60d37c75f9
Added radeonhd support to xserver job
...
svn path=/nixos/trunk/; revision=12206
2008-06-28 07:46:50 +00:00
90acbf9509
* mysql: merged the mysql expression in the services tree.
...
* mysql: run under a separate user ("mysql"), not under "nobody".
* mysql: put the PID under /var/run.
svn path=/nixos/trunk/; revision=12189
2008-06-25 21:58:51 +00:00
91e2083d32
* Load the wis-go7007 firmware automatically.
...
svn path=/nixos/trunk/; revision=12170
2008-06-20 16:10:20 +00:00
1ec810f844
* Clean up indentation.
...
svn path=/nixos/trunk/; revision=12169
2008-06-20 16:09:48 +00:00
d28ecc593f
* hal: less verbosity.
...
svn path=/nixos/trunk/; revision=12031
2008-06-10 16:15:37 +00:00
a20f4aff60
* Updated the splash screen support for Linux >= 2.6.25.
...
svn path=/nixos/trunk/; revision=12030
2008-06-10 16:10:23 +00:00
a49eb4d1f9
* extraSubservices: renamed `serviceName' to `serviceType' which is more
...
correct.
svn path=/nixos/trunk/; revision=12026
2008-06-09 16:41:41 +00:00
5235acb1d7
* extraSubservices: the subservice config no longer needs to be
...
in a `config' attribute. So instead of
extraSubservices = [
{ serviceName = "foo";
config = {
bla = ...;
};
}
];
you can write
extraSubservices = [
{ serviceName = "foo";
bla = ...;
}
];
svn path=/nixos/trunk/; revision=12024
2008-06-09 16:35:24 +00:00
f17f9e301f
svn path=/nixos/trunk/; revision=12023
2008-06-09 16:02:38 +00:00
deaf99ca92
* Added a subservices for the Zabbix PHP frontend.
...
* Apache subservices: missing declarations are filled in with defaults.
svn path=/nixos/trunk/; revision=12022
2008-06-09 15:52:02 +00:00
0b068f504c
* Less verbosity.
...
svn path=/nixos/trunk/; revision=12017
2008-06-09 11:14:43 +00:00
6d380a8ce8
* Option to set the Zabbix server IP.
...
svn path=/nixos/trunk/; revision=12012
2008-06-08 22:21:56 +00:00
b8aa6c6f31
svn path=/nixos/trunk/; revision=12001
2008-06-06 12:38:40 +00:00
96a8dbfd58
* Upstart jobs for the Zabbix agent and server daemons.
...
svn path=/nixos/trunk/; revision=11998
2008-06-06 09:13:16 +00:00
33aae3136a
Make old http service working again
...
svn path=/nixos/trunk/; revision=11956
2008-06-03 13:30:37 +00:00
eff945115b
Added gpm service
...
svn path=/nixos/trunk/; revision=11952
2008-06-03 07:06:35 +00:00
da13d7ed13
Fixed instantiation errors after kernel changes...
...
svn path=/nixos/trunk/; revision=11886
2008-05-23 06:40:16 +00:00
bb1ee3f190
* boot.kernel renamed to boot.kernelPackages (see the help for a
...
description) to allow all kernel-related packages to be overriden
easily. For instance, you can now say in configuration.nix
boot = {
kernelPackages = pkgs: pkgs.kernelPackages_2_6_25;
};
to use Linux 2.6.25.x. Externel kernel module packages (like
the NVIDIA drivers) appropriate for this kernel will then be used
automatically.
svn path=/nixos/trunk/; revision=11880
2008-05-22 11:59:46 +00:00
b5451023a2
Applied patch sent by justbeingglad long ago..
...
svn path=/nixos/trunk/; revision=11833
2008-05-16 07:32:00 +00:00
828305a5ac
* Prevent warnings about protocol version 1 being disabled.
...
svn path=/nixos/trunk/; revision=11782
2008-05-08 14:29:00 +00:00
c44475b085
* Start klogd to send kernel log messages to syslogd.
...
svn path=/nixos/trunk/; revision=11781
2008-05-08 13:47:44 +00:00
6f64c4ee0d
* syslogd: print messages in the local time zone.
...
* dhcpd: log to facility "local1".
* syslogd: send "local1" messages to /var/log/dhcpd, and "mail"
messages to /var/log/mail.
svn path=/nixos/trunk/; revision=11780
2008-05-08 12:27:01 +00:00
5d5f48af83
* Some robots blocks.
...
svn path=/nixos/trunk/; revision=11762
2008-05-06 08:04:28 +00:00
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
7ee619f83d
Typo fix & NameVirtualHost generation
...
svn path=/nixos/trunk/; revision=11710
2008-04-24 18:32:05 +00:00
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
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
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
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
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
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
5e1ee10f3c
HTTPS support in httpd upstart job fixed.
...
svn path=/nixos/trunk/; revision=11613
2008-04-12 20:08:35 +00:00
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
10cc22203e
* No longer needed.
...
svn path=/nixos/trunk/; revision=11538
2008-04-10 09:14:55 +00:00
8c4ebbd24a
Some tweaks for Gateway6 job
...
svn path=/nixos/trunk/; revision=11496
2008-04-08 21:41:01 +00:00
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
a0fc21eda3
Add `atd' Upstart job.
...
svn path=/nixos/trunk/; revision=11435
2008-04-01 10:16:35 +00:00
3957962cf9
BitlBee: Run as `bitlbee' instead of `root'.
...
svn path=/nixos/trunk/; revision=11292
2008-03-26 16:42:57 +00:00
f9cbd6e640
avahi-daemon: Start on `network-interfaces/started'.
...
svn path=/nixos/trunk/; revision=11291
2008-03-26 16:41:31 +00:00
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
3b603a2281
synergyc ip last arg fix
...
svn path=/nixos/trunk/; revision=11280
2008-03-25 00:14:05 +00:00
0fbd66414a
enhanced error reporting missing config attr (new job proposal)
...
svn path=/nixos/trunk/; revision=11279
2008-03-25 00:06:58 +00:00
060533c8a1
Fixes to OpenFire
...
svn path=/nixos/trunk/; revision=11264
2008-03-22 17:54:13 +00:00
3703cd13a2
* Quick hack to make HAL start properly.
...
svn path=/nixos/trunk/; revision=11262
2008-03-22 16:05:01 +00:00
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
2cc2831563
* Indentation.
...
svn path=/nixos/trunk/; revision=11231
2008-03-20 14:38:49 +00:00
465a66ab3f
renamed newProposal directory
...
added two example jobs
svn path=/nixos/trunk/; revision=11146
2008-03-16 15:52:52 +00:00
e4757b33b1
removed trace lines, Thanks raskin
...
svn path=/nixos/trunk/; revision=11144
2008-03-16 11:03:03 +00:00
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
cf16b3acfe
Add `portmap' job.
...
svn path=/nixos/trunk/; revision=11140
2008-03-15 23:40:44 +00:00
6c8bae53c1
Added PermitRootLogin option for sshd
...
svn path=/nixos/trunk/; revision=11121
2008-03-14 12:53:14 +00:00
5005c49e45
Added forgotten documentRoot variable
...
svn path=/nixos/trunk/; revision=11081
2008-03-12 12:21:12 +00:00
58240dc30d
Add the option xkbModel in the xserver.
...
svn path=/nixos/trunk/; revision=11041
2008-03-10 17:33:13 +00:00
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
9650b0859e
Fix `avahi-daemon' Upstart job.
...
svn path=/nixos/trunk/; revision=11002
2008-03-06 20:56:50 +00:00
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
3cde6bd187
Add support for lshd (SSH2 daemon of GNU lsh).
...
svn path=/nixos/trunk/; revision=10969
2008-03-05 16:03:09 +00:00
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
e48a01523f
Gateway6 upstart job update.
...
svn path=/nixos/trunk/; revision=10953
2008-03-04 15:30:54 +00:00
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
8b98c3b125
svn path=/nixos/trunk/; revision=10947
2008-03-04 13:37:52 +00:00
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
c4617e5b04
svn path=/nixos/trunk/; revision=10853
2008-02-25 13:30:23 +00:00
d5c09f9b61
* Clear args (NIXPKGS-86).
...
svn path=/nixos/trunk/; revision=10852
2008-02-25 13:20:00 +00:00
3dcd0cc7a4
* stdenvUsingSetupNew2 -> stdenv.
...
svn path=/nixos/trunk/; revision=10850
2008-02-25 12:43:38 +00:00
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
ebea2dafa1
* Quick hack to get the old Apache job working.
...
svn path=/nixos/trunk/; revision=10785
2008-02-20 17:03:48 +00:00
50800ad3b5
svn path=/nixos/trunk/; revision=10781
2008-02-20 13:29:08 +00:00
705c2d36db
svn path=/nixos/trunk/; revision=10777
2008-02-20 12:54:17 +00:00
672d293c2b
Added support for the Zydas zd1211 firmware.
...
svn path=/nixos/trunk/; revision=10763
2008-02-20 09:01:26 +00:00
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
5d2435d460
* Top-level redirect to the repoman.
...
svn path=/nixos/trunk/; revision=10758
2008-02-19 16:52:24 +00:00
20881fe84b
* Indentation.
...
svn path=/nixos/trunk/; revision=10757
2008-02-19 16:52:08 +00:00
a2c20a9d29
* Virtual hosts: inherit adminAddr from the main server.
...
svn path=/nixos/trunk/; revision=10756
2008-02-19 14:54:19 +00:00
d7dd9179ce
* Allow aliases for each virtual host.
...
svn path=/nixos/trunk/; revision=10754
2008-02-19 14:41:20 +00:00
5122633592
Add support for Intel's 4965AGN firmware.
...
svn path=/nixos/trunk/; revision=10735
2008-02-18 16:50:08 +00:00
bbbef0f2fa
* extraDirectores -> extraConfig.
...
svn path=/nixos/trunk/; revision=10731
2008-02-18 15:00:26 +00:00
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
b98cb9a770
Add BitlBee Upstart job in deamon mode.
...
svn path=/nixos/trunk/; revision=10720
2008-02-18 09:15:10 +00:00
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
7563d6e144
svn path=/nixos/trunk/; revision=10693
2008-02-14 20:14:57 +00:00
a06b51f895
svn path=/nixos/trunk/; revision=10692
2008-02-14 19:47:17 +00:00
ffd96f07fe
svn path=/nixos/trunk/; revision=10689
2008-02-14 14:29:21 +00:00
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
44fceb9c4d
svn path=/nixos/trunk/; revision=10686
2008-02-14 13:37:09 +00:00
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
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
Nicolas Pierron
Eelco Dolstra
Lluís Batlle i Rossell
Ludovic Courtès
Sander van der Burg
Michael Raskin
Marc Weber
Tobias Hammerschmidt