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
Sander van der Burg
e171b6d86e
Added option to specify directories as a path for MySQL database schemas.
...
By using this approach we no longer have to specify schemas like this:
schema = "${myDatabaseSchemaDrvFun}/prefix/to/the/sqlfile.sql";
but like this:
schema = myDataBaseSchemaDrv;
which is in some cases more convenient.
svn path=/nixos/branches/upstart-0.6/; revision=18450
2009-11-18 21:56:47 +00:00
Sander van der Burg
27d0d2927e
Added initialDatabases option to the MySQL service. This is useful for e.g. automatically intialing databases in a test VM
...
svn path=/nixos/branches/upstart-0.6/; revision=18437
2009-11-18 16:19:04 +00:00
Michael Raskin
ea2417ac87
Apply Eelco Dolstra's formatting suggestions
...
svn path=/nixos/trunk/; revision=18436
2009-11-18 15:11:54 +00:00
Michael Raskin
26f83d65e4
Adding GVPE service
...
svn path=/nixos/trunk/; revision=18431
2009-11-18 14:54:37 +00:00
Sander van der Burg
6d11d63ba3
Removed the nasty sleep hack of tomcat, since upstart-0,6 is also capable of only executing start and stop scripts
...
svn path=/nixos/branches/upstart-0.6/; revision=18430
2009-11-18 14:50:48 +00:00
Marco Maggesi
58b3476dfc
Automatic download of CellServDB for OpenAFS client.
...
svn path=/nixos/trunk/; revision=18417
2009-11-18 13:28:16 +00:00
Eelco Dolstra
aa9d0a067e
* Sync with the trunk.
...
svn path=/nixos/branches/upstart-0.6/; revision=18408
2009-11-18 11:50:06 +00:00
Michael Raskin
ddc5a7d7c5
Oops, placed mkIf in the wrong place. Fixing
...
svn path=/nixos/trunk/; revision=18402
2009-11-18 09:30:38 +00:00
Michael Raskin
a94da97354
Make monit actually switchable off
...
svn path=/nixos/trunk/; revision=18401
2009-11-18 09:29:43 +00:00
Michael Raskin
1a05efa66a
Adding Monit - one more service to watch system..
...
svn path=/nixos/trunk/; revision=18399
2009-11-18 08:39:10 +00:00
Michael Raskin
f9958cbb44
Update kernel version for fresh-kernel
...
svn path=/nixos/trunk/; revision=18379
2009-11-17 09:00:49 +00:00
Eelco Dolstra
e9b2ef9fb7
* Restart wpa_supplicant and dhclient on resume.
...
svn path=/nixos/branches/upstart-0.6/; revision=18360
2009-11-15 20:40:41 +00:00
Eelco Dolstra
0755e228bf
* Since "initctl stop" is now synchronous, the sleep is no longer
...
needed.
svn path=/nixos/branches/upstart-0.6/; revision=18359
2009-11-15 20:40:07 +00:00
Eelco Dolstra
56d817b0b0
* X server: remove the udev hack.
...
svn path=/nixos/branches/upstart-0.6/; revision=18358
2009-11-15 20:38:19 +00:00
Eelco Dolstra
9174b4ab42
* Provide a convience option for commands that must be executed both
...
when the system boots and when it resumes from suspend.
svn path=/nixos/branches/upstart-0.6/; revision=18354
2009-11-15 12:56:40 +00:00
Eelco Dolstra
1affc9168e
* Move power management configuration into a separate module from
...
the acpid service.
* Add a pm-utils hook to allow commands to be executed when the system
suspends/resumes etc.
svn path=/nixos/branches/upstart-0.6/; revision=18353
2009-11-15 12:48:42 +00:00
Eelco Dolstra
c1b008b4e3
* Don't build the Grub menu builder script on the ISO. Then we don't
...
the /init and /system symlinks on the CD (since it removes the
cyclic dependency between building the Grub menu and the system
derivation).
svn path=/nixos/branches/upstart-0.6/; revision=18344
2009-11-14 16:12:02 +00:00
Lluís Batlle i Rossell
e164ea4df8
Fixing bash syntax errors in the generations-dir builder.
...
svn path=/nixos/trunk/; revision=18342
2009-11-13 19:30:39 +00:00
Eelco Dolstra
7621b40d56
* Provide a 640x480 background image for GRUB 2.
...
* Turn on the graphical GRUB boot screen for the installation CD.
svn path=/nixos/branches/upstart-0.6/; revision=18340
2009-11-13 16:45:41 +00:00
Eelco Dolstra
091631b433
* Use Grub 2 on the installation CD. No graphics yet.
...
svn path=/nixos/branches/upstart-0.6/; revision=18325
2009-11-10 21:42:38 +00:00
Sander van der Burg
4af37a0994
VirtualBox Xorg driver needs xrefresh, so added it to the environment when using the virtualbox driver
...
svn path=/nixos/trunk/; revision=18322
2009-11-10 15:25:50 +00:00
Marco Maggesi
4bc162df4c
Add configurations for package OpenAFS (added forgotten files)
...
svn path=/nixos/trunk/; revision=18321
2009-11-10 15:22:57 +00:00
Marco Maggesi
f9b44a7f0d
Add configurations for package OpenAFS
...
svn path=/nixos/trunk/; revision=18320
2009-11-10 15:01:12 +00:00
Eelco Dolstra
d1bbe706a2
* Synced with the trunk.
...
svn path=/nixos/branches/upstart-0.6/; revision=18297
2009-11-08 21:27:53 +00:00
Lluís Batlle i Rossell
de1713a24f
Failing when the top level system expression cannot find the kernel image
...
svn path=/nixos/trunk/; revision=18291
2009-11-08 18:32:21 +00:00
Lluís Batlle i Rossell
420639a4b1
Making generations-dir consider the pkgs.platform.
...
stdenv-updates stuff. Still to be reviewed, but at least an implementation to have
some different armv5tel-linux platforms: qemu versatile and the sheevaplug.
svn path=/nixos/trunk/; revision=18290
2009-11-08 17:38:35 +00:00
Nicolas Pierron
616c844336
* Move the default value of videoDrivers into the default field of the
...
option. Otherwise, the system may depends on unused/unsupported
softwares and users will be force to use properties in their
configuration.nix file to override this default value. (too complex for
new users)
svn path=/nixos/trunk/; revision=18288
2009-11-08 16:01:22 +00:00
Eelco Dolstra
37470cccc5
* Blacklist the "evbug" module.
...
svn path=/nixos/trunk/; revision=18285
2009-11-08 09:08:50 +00:00
Eelco Dolstra
16c2aa734f
* Generate /etc/modprobe.conf to allow the setting of module options
...
and the blacklisting of modules.
svn path=/nixos/trunk/; revision=18284
2009-11-08 09:01:53 +00:00
Wouter den Breejen
b0ba17873c
Fixed hash replace with a variable to the real hash
...
svn path=/nixos/trunk/; revision=18268
2009-11-07 21:03:57 +00:00
Eelco Dolstra
9bf8801dc6
* Use a tmpfs for /var/run/nscd to ensure that / or /var can be
...
unmounted or at least remounted read-only during shutdown. Upstart
0.6 apparently uses nscd to do some name lookups, resulting in it
holding some mmap mappings to deleted files in /var/run/nscd.
E.g. lsof shows:
init 1 root DEL REG 253,0 1850313 /var/run/nscd/dbyn3Piz
init 1 root DEL REG 253,0 1850312 /var/run/nscd/dbt2e8PH
See also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=324900 .
This is a workaround - it would be better if Upstart didn't do this.
svn path=/nixos/branches/upstart-0.6/; revision=18258
2009-11-07 15:29:46 +00:00
Eelco Dolstra
2353e53c5f
* /var/run/safemode isn't used anywhere.
...
svn path=/nixos/branches/upstart-0.6/; revision=18257
2009-11-07 15:24:59 +00:00
Eelco Dolstra
d9d072a89b
* Improve the mysql shutdown.
...
svn path=/nixos/branches/upstart-0.6/; revision=18255
2009-11-07 12:43:32 +00:00
Eelco Dolstra
7aecd0ca53
* hal: depend on both dbus and acpid (if enabled).
...
* dbus: don't signal Upstart, since that seems to make it forget about
pending events or something. In any case starting dbus after acpid
was running wouldn't trigger hal to be started (but the other way
around did work).
svn path=/nixos/branches/upstart-0.6/; revision=18251
2009-11-07 12:01:12 +00:00
Eelco Dolstra
7d47575a58
* A 15-second timeout to start the X server is too low if there are a
...
billion other daemons starting at the same time during the boot.
svn path=/nixos/branches/upstart-0.6/; revision=18250
2009-11-07 11:32:28 +00:00
Eelco Dolstra
b7c519456e
* Updated switch-to-configuration for Upstart 0.6.
...
svn path=/nixos/branches/upstart-0.6/; revision=18237
2009-11-07 01:17:56 +00:00
Eelco Dolstra
06fcb121fb
* Shut down PostgreSQL cleanly.
...
svn path=/nixos/branches/upstart-0.6/; revision=18236
2009-11-06 23:37:31 +00:00
Eelco Dolstra
18f2d75275
* Set a timezone in the PostgreSQL job. Otherwise database
...
initialisation will be incredibly slow (minutes instead of
seconds). An strace shows that it's continuously looking up
timezone information if TZ is empty.
svn path=/nixos/branches/upstart-0.6/; revision=18235
2009-11-06 22:56:47 +00:00
Eelco Dolstra
d7342c78d4
* Support pre-stop scripts. These are needed to cleanly shutdown
...
daemons such as Apache or PostgreSQL.
svn path=/nixos/branches/upstart-0.6/; revision=18234
2009-11-06 22:45:19 +00:00
Eelco Dolstra
83a9bf9a6a
* Change all the startOn / stopOn attributes to the Upstart 0.6 syntax
...
(e.g., startOn = "started foo" instead of startOn = "foo").
svn path=/nixos/branches/upstart-0.6/; revision=18230
2009-11-06 22:19:17 +00:00
Eelco Dolstra
6b0842ff52
svn path=/nixos/branches/upstart-0.6/; revision=18229
2009-11-06 21:51:28 +00:00
Eelco Dolstra
a60d83d3b4
svn path=/nixos/branches/upstart-0.6/; revision=18228
2009-11-06 21:39:18 +00:00
Eelco Dolstra
d545d08461
* In the network-interfaces task, emit an ip-up event if there is a
...
statically configured interface (i.e. we're not running dhclient).
Otherwise the ntpd job won't be triggered.
* Use the "-n" flag of "initctl emit" to send the event
asynchronously.
svn path=/nixos/branches/upstart-0.6/; revision=18227
2009-11-06 21:38:40 +00:00
Eelco Dolstra
4b2ff53ec6
* Don't stop jobs that are already stopped.
...
svn path=/nixos/branches/upstart-0.6/; revision=18226
2009-11-06 21:17:11 +00:00
Eelco Dolstra
82c3e2aa50
* Updated poweroff/reboot/maintenance mode for Upstart 0.6. Upstart
...
no longer emits specific events for those. Instead it emits a
"runlevel" event. The "runlevel" task starts the "shutdown" task to
perform the desired action.
* Upstart 0.6 no longer has a "shutdown" event, so "stop on shutdown"
no longer works. Therefore the shutdown task explicitly stops all
running Upstart jobs, before sending a TERM/KILL signal to all
remaining processes.
* Do a "chvt 1" at the start of the shutdown task to switch to the
console.
* Use /dev/console instead of /dev/tty1, since if somebody is logged
in on tty1, bad things will happen.
svn path=/nixos/branches/upstart-0.6/; revision=18224
2009-11-06 21:08:06 +00:00
Eelco Dolstra
676da4d87d
* Updated some more jobs.
...
svn path=/nixos/branches/upstart-0.6/; revision=18219
2009-11-06 19:20:09 +00:00
Eelco Dolstra
3fcb7c2cb5
* Set the nameserver.
...
svn path=/nixos/branches/upstart-0.6/; revision=18218
2009-11-06 19:19:46 +00:00
Eelco Dolstra
c0f732f079
* Work around a lack of laziness in the xserver.nix module.
...
svn path=/nixos/trunk/; revision=18216
2009-11-06 16:30:48 +00:00
Nicolas Pierron
e07f1e98db
* Revert 18115, 18150, 18135, 18112, 18107-18105.
...
Revert modifications done on apache-httpd configurations.
svn path=/nixos/trunk/; revision=18215
2009-11-06 16:23:25 +00:00
Eelco Dolstra
b9bfe7ed43
* Connect Upstart to the system bus.
...
svn path=/nixos/branches/upstart-0.6/; revision=18213
2009-11-06 15:59:23 +00:00
Eelco Dolstra
9fa2f12cc2
* Do some more jobs.
...
svn path=/nixos/branches/upstart-0.6/; revision=18212
2009-11-06 15:46:56 +00:00
Eelco Dolstra
903e92bde6
* Use Upstart's "export fork" feature to properly detect when a daemon
...
is "ready". This prevents ugly race conditions, e.g. HAL failing to
start because dbus hasn't finished starting yet.
* Support post-start scripts. These are executed after the job's main
process has started but before the job's "started" event is
emitted. For instance, the udev job uses this to perform "udevadm
trigger / settle" to create all devices. Previously this had to be
done in the pre-start script, so the daemon had to started in the
pre-start script as well.
svn path=/nixos/branches/upstart-0.6/; revision=18211
2009-11-06 15:23:16 +00:00
Marco Maggesi
ae23b68ee8
Add configurations for MIT kerberos.
...
svn path=/nixos/trunk/; revision=18203
2009-11-06 12:58:44 +00:00
Eelco Dolstra
5d240b99d5
* Work around a bug in HAL (it fails to start if $PATH is too long,
...
since it uses a 512-byte buffer somewhere).
svn path=/nixos/branches/upstart-0.6/; revision=18198
2009-11-06 11:31:57 +00:00
Eelco Dolstra
7011a9315f
* Use Upstart 0.6. Jobs are now in /etc/init instead of /etc/event.d.
...
svn path=/nixos/branches/upstart-0.6/; revision=18192
2009-11-06 10:43:38 +00:00
Eelco Dolstra
b581a56d79
* Define the Upstart package to use in one place.
...
svn path=/nixos/branches/upstart-0.6/; revision=18187
2009-11-06 09:36:35 +00:00
Eelco Dolstra
5fc4590ce5
* Fix indentation.
...
svn path=/nixos/branches/upstart-0.6/; revision=18186
2009-11-06 09:26:36 +00:00
Eelco Dolstra
124096e418
* Remember the original symbolic driver name.
...
svn path=/nixos/trunk/; revision=18185
2009-11-06 09:22:00 +00:00
Eelco Dolstra
3e9665dd96
* X server autoconfiguration. Rather than specifying a fixed video
...
driver (in services.xserver.videoDriver), the X server is now given
a set of drivers, and will use PCI ids to find the right one.
The only problem is that the choice of OpenGL driver (the
/var/run/opengl-driver symlink) depends on what driver is selected
at runtime (i.e. the NVIDIA implementation for "nvidia", and Mesa
for all other drivers). However this isn't a big problem right now
since "nvidia" isn't included in the default set of drivers anyway
for legal reasons.
* `services.xserver.resolutions' now defaults to [], meaning that the
X server should figure out the desired resolution(s) itself.
Likewise, `services.xserver.defaultDepth' defaults to 0 to let the X
server figure it out.
* Removed some options from xorg.conf that no longer appear needed
("Composite" and the DRI "Mode").
svn path=/nixos/trunk/; revision=18176
2009-11-06 00:59:03 +00:00
Lluís Batlle i Rossell
fe1f084728
Adding a new xorg driver: unichrome
...
svn path=/nixos/trunk/; revision=18163
2009-11-05 21:35:36 +00:00
Nicolas Pierron
72f804c9b2
* Fix subversion test and change the name of the "config" option to
...
"configuration" because it may interfered with sub-modules keywords.
svn path=/nixos/trunk/; revision=18155
2009-11-05 19:24:02 +00:00
Nicolas Pierron
7571055ad3
* Declare options for sub-services.
...
* Add deprecated options for "serviceType", "serviceName", "function" and
"config" without changing the behavior.
svn path=/nixos/trunk/; revision=18150
2009-11-05 18:21:03 +00:00
Nicolas Pierron
1952365a51
* Remove unused subservice syntax.
...
svn path=/nixos/trunk/; revision=18135
2009-11-05 13:34:01 +00:00
Eelco Dolstra
ad17a6dce3
* Changes related to the xorg-7.5 merge.
...
svn path=/nixos/trunk/; revision=18126
2009-11-04 22:44:40 +00:00
Eelco Dolstra
3f7eb694a9
* CUPS provides a dbus service.
...
svn path=/nixos/trunk/; revision=18125
2009-11-04 22:44:21 +00:00
Nicolas Pierron
8734b7103e
* Remove needs to call getPort to access the server port. This is made
...
possible by using sub-modules arguments.
svn path=/nixos/trunk/; revision=18112
2009-11-04 18:14:42 +00:00
Nicolas Pierron
0e22df1587
* Use sub-modules for httpd virtual hosts. This add documentation entries
...
and allow non-intrusive extensions of virtual hosts.
svn path=/nixos/trunk/; revision=18107
2009-11-04 17:00:53 +00:00
Nicolas Pierron
ff1d9969fb
* re-indent per-server-options.nix content.
...
svn path=/nixos/trunk/; revision=18106
2009-11-04 17:00:48 +00:00
Nicolas Pierron
063224bc84
* Convert per-server-options into a module.
...
svn path=/nixos/trunk/; revision=18105
2009-11-04 17:00:42 +00:00
Sander van der Burg
46558b31a0
Added ejabberd to the systemPackages and fixed some command line arguments. This will make the ejabberd service working again
...
svn path=/nixos/trunk/; revision=18070
2009-11-02 12:13:09 +00:00
Nicolas Pierron
8c5b200164
* boor.loader.grub.device can only be defined once.
...
* Replace an obscure piece of code by its equivalent based on the
recursiveUpdate function. Undefined the obsolete name of
boot.grubDevice to avoid conflicts.
svn path=/nixos/trunk/; revision=18049
2009-10-30 11:57:23 +00:00
Eelco Dolstra
b86e8208d5
* Doh! The mount options weren't passed properly.
...
svn path=/nixos/trunk/; revision=18047
2009-10-30 08:49:35 +00:00
Eelco Dolstra
11022e8d9f
* Back out r17946 and 17948 because it doesn't work. I've seen it
...
fail to update /etc twice now. It's also unnecessarily complex
IMHO (see nix-dev).
svn path=/nixos/trunk/; revision=18045
2009-10-30 08:37:08 +00:00
Nicolas Pierron
c195493a32
* Add a hacky for-loop to fix the usage of the continue keyword. (NIXOS-85)
...
The continue keyword was previously used to mount the next device, but
the loop in has been removed. (see r17919)
svn path=/nixos/trunk/; revision=17973
2009-10-27 10:45:18 +00:00
Michael Raskin
ca6f5e6cd4
Further reducing writes on boot.. Do not copy /etc unless it changed
...
svn path=/nixos/trunk/; revision=17948
2009-10-24 00:03:13 +00:00
Michael Raskin
893f13bb14
Some boot optimisations attempted. My system boots a few times faster now, and I cannot see how these can break things.
...
svn path=/nixos/trunk/; revision=17946
2009-10-23 20:30:12 +00:00
Marc Weber
4f006e49bf
openvpn was broken by jobAttrs. fixed
...
svn path=/nixos/trunk/; revision=17940
2009-10-23 11:30:54 +00:00
Sander van der Burg
ac5bc4a68a
Added XDMCP option to KDM
...
svn path=/nixos/trunk/; revision=17938
2009-10-23 10:54:35 +00:00
Rob Vermaas
5103c7a872
list possible logformats for apache and added example
...
svn path=/nixos/trunk/; revision=17929
2009-10-22 17:37:06 +00:00
Rob Vermaas
9e80ca48cb
added option to specify logformat to apache httpd, defaults to common (like it was until now)
...
svn path=/nixos/trunk/; revision=17923
2009-10-22 14:36:54 +00:00
Eelco Dolstra
1e1ae9cd1e
* Don't squeeze all the filesystem option values into one environment
...
variable, since they might get confused (NIXOS-84).
svn path=/nixos/trunk/; revision=17919
2009-10-22 07:46:30 +00:00
Eelco Dolstra
feeff52285
* Ugly hack to get HAL to start at boot time. Sometimes it fails
...
without any error message in the log (maybe ConsoleKit related?).
svn path=/nixos/trunk/; revision=17907
2009-10-21 09:41:32 +00:00
Michael Raskin
35abca4e7a
Forward-port sshd fixes to iso-minimal-fresh-kernel. By the way, maybe we should finalyy decide what to do with kernel update and corresponding ISO update (to fresh-kernel proposal or otherwise)
...
svn path=/nixos/trunk/; revision=17840
2009-10-16 04:27:59 +00:00
Marc Weber
fceadcbef7
--redo -> --fast
...
svn path=/nixos/trunk/; revision=17839
2009-10-15 23:39:57 +00:00
Eelco Dolstra
5dfaf565bf
* On the CD or on a newly installed system, create the root account
...
with an empty password, rather than with a hashed empty password.
The latter is a security risk, because it allows remote root logins
if a user enables sshd before setting a proper root password.
* Allow empty passwords for login and slim, but nothing else.
svn path=/nixos/trunk/; revision=17833
2009-10-15 14:41:59 +00:00
Eelco Dolstra
77ec877a8c
* Fix the background of the manual.
...
svn path=/nixos/trunk/; revision=17832
2009-10-15 14:35:10 +00:00
Eelco Dolstra
da5f745603
* You need an override here, otherwise bad things happen.
...
svn path=/nixos/trunk/; revision=17831
2009-10-15 14:32:15 +00:00
Eelco Dolstra
762c13b83e
* Fix the Rogue job.
...
svn path=/nixos/trunk/; revision=17830
2009-10-15 14:02:24 +00:00
Eelco Dolstra
e055085ac1
svn path=/nixos/trunk/; revision=17823
2009-10-15 12:32:33 +00:00
Eelco Dolstra
f6f5d0414e
* Run the nix-daemon with a lower I/O priority so that it doesn't
...
interfere with interactive tasks as much (hopefully).
svn path=/nixos/trunk/; revision=17820
2009-10-15 11:25:15 +00:00
Sander van der Burg
f57f344996
Changed vboxvideo identifier to virtualbox for clarity
...
svn path=/nixos/trunk/; revision=17816
2009-10-15 09:31:30 +00:00
Ludovic Courtès
6472ee4d20
X11: Always honor ~/.xsession.
...
See http://thread.gmane.org/gmane.linux.distributions.nixos/2879 .
svn path=/nixos/trunk/; revision=17814
2009-10-15 08:27:51 +00:00
Marc Weber
f3472f7163
new nixos-rebuild shortcut for --no-fetch --no-nix-build --show-trace called --redo
...
svn path=/nixos/trunk/; revision=17813
2009-10-14 23:56:11 +00:00
Marc Weber
ba496e25c4
allow starting of sshd using "start sshd" - but don't start it on
...
startup automatically because root password is empty by default.
svn path=/nixos/trunk/; revision=17811
2009-10-14 21:48:12 +00:00
Marc Weber
e611266285
Revert "add /root/my-firmware to the list of firmware directories"
...
This reverts rev 17809 - I missed the update
svn path=/nixos/trunk/; revision=17810
2009-10-14 21:44:25 +00:00
Marc Weber
70b4e1a371
add /root/my-firmware to the list of firmware directories
...
svn path=/nixos/trunk/; revision=17809
2009-10-14 21:35:39 +00:00
Lluís Batlle i Rossell
336d33e591
Adding the wifi nic rt73 firmware into the nixos cds.
...
I'm not sure if I had to add the module file reference in "required", or all
modules are properly loaded.
svn path=/nixos/trunk/; revision=17800
2009-10-14 13:10:41 +00:00
Eelco Dolstra
e4defbe8bd
* Bring back loading of firmware from /root/test-firmware.
...
svn path=/nixos/trunk/; revision=17797
2009-10-14 09:38:56 +00:00
Ludovic Courtès
290f41bd9f
GRUB: "Grub" -> "GRUB".
...
svn path=/nixos/trunk/; revision=17793
2009-10-13 21:39:23 +00:00
Ludovic Courtès
f9541e0d12
Add GRUB 2 support.
...
svn path=/nixos/trunk/; revision=17792
2009-10-13 21:39:18 +00:00
Marc Weber
ccd2a0b617
sudo default configFile: replace outdated comment
...
svn path=/nixos/trunk/; revision=17790
2009-10-13 21:29:30 +00:00
Lluís Batlle i Rossell
e9702320bf
Fixing nvidiaLegacy /var/run/opengl-driver
...
svn path=/nixos/trunk/; revision=17786
2009-10-13 17:52:58 +00:00
Lluís Batlle i Rossell
a347979be5
Adding nvidiaLegacy xorg option for suspend to work
...
svn path=/nixos/trunk/; revision=17785
2009-10-13 17:52:49 +00:00
Sander van der Burg
8457873334
The 'resolution section' is not generated in the xorg.conf when using the vboxvideo driver. This allows us to perform dynamic resolution resizing
...
svn path=/nixos/trunk/; revision=17784
2009-10-13 15:16:30 +00:00
Sander van der Burg
4eea2539c1
Added udev permissions for virtualbox guest additions
...
svn path=/nixos/trunk/; revision=17783
2009-10-13 15:05:06 +00:00
Sander van der Burg
b9d9802c45
Pass virtualbox package as HAL package, so that the guest mouse cursor will follow the host mouse cursor
...
svn path=/nixos/trunk/; revision=17781
2009-10-13 14:30:37 +00:00
Sander van der Burg
50902d2e58
Added some basic VirtualBox driver support. Input driver and dynamic resizing still remains on my todo list
...
svn path=/nixos/trunk/; revision=17779
2009-10-13 13:56:30 +00:00
Eelco Dolstra
1581d91330
* Fix the job name of the Nix daemon.
...
svn path=/nixos/trunk/; revision=17776
2009-10-13 10:09:06 +00:00
Nicolas Pierron
24cbefd7a8
Fix example value of httpd.
...
svn path=/nixos/trunk/; revision=17774
2009-10-13 09:49:26 +00:00
Eelco Dolstra
eba8f94069
* jobAttrs -> jobs.
...
svn path=/nixos/trunk/; revision=17769
2009-10-12 18:09:34 +00:00
Eelco Dolstra
40c9057a49
* Remove the obsolete "jobs" option.
...
svn path=/nixos/trunk/; revision=17765
2009-10-12 17:32:30 +00:00
Eelco Dolstra
d982f23f20
* Convert the remaining jobs to jobAttrs style.
...
svn path=/nixos/trunk/; revision=17764
2009-10-12 17:27:57 +00:00
Eelco Dolstra
9943e0762e
* Update some more modules.
...
svn path=/nixos/trunk/; revision=17763
2009-10-12 17:09:38 +00:00
Eelco Dolstra
e91d882a94
* Converted modules that were still using the old (concrete syntax)
...
style of declaring Upstart jobs. While at it, converted them to the
current NixOS module style and improved some option descriptions.
Hopefully I didn't break too much :-)
svn path=/nixos/trunk/; revision=17761
2009-10-12 16:36:19 +00:00
Eelco Dolstra
4a78ef25e7
* Start mysql automatically on startup.
...
svn path=/nixos/trunk/; revision=17755
2009-10-12 11:30:43 +00:00
Michael Raskin
32229e0c05
Make NixOS harder to kill on boot by leaving stale locks for mtab
...
svn path=/nixos/trunk/; revision=17734
2009-10-09 16:09:56 +00:00
Eelco Dolstra
679c3f9295
* Fix the xfsprogs/jfsutils attribute names. TODO: these shouldn't be
...
listed in three different places. The set of "rescue" packages
should be factored out into a separate module.
svn path=/nixos/trunk/; revision=17727
2009-10-08 13:10:08 +00:00
Rob Vermaas
a39b238e69
symlink handling mode for sitecopy backup
...
svn path=/nixos/trunk/; revision=17716
2009-10-08 11:08:45 +00:00
Rob Vermaas
81e37d8475
added deps for activation scripts of backup modules
...
svn path=/nixos/trunk/; revision=17714
2009-10-08 09:29:16 +00:00
Rob Vermaas
8d9c51a991
activation script should have unique name
...
svn path=/nixos/trunk/; revision=17706
2009-10-07 20:05:08 +00:00
Nicolas Pierron
2e34baba3b
Rename environment.extraPackages to environment.systemPackages.
...
svn path=/nixos/trunk/; revision=17705
2009-10-07 17:14:25 +00:00
Sander van der Burg
43b3ccc620
remove unnecessary concatstrings
...
svn path=/nixos/trunk/; revision=17699
2009-10-07 13:12:45 +00:00
Rob Vermaas
00668de9f1
removed unnecessary optional
...
svn path=/nixos/trunk/; revision=17697
2009-10-07 13:00:37 +00:00
Rob Vermaas
ddf7a784e7
* removed unnecessary comments
...
svn path=/nixos/trunk/; revision=17696
2009-10-07 12:54:22 +00:00
Rob Vermaas
cc5d5b3e77
* removed unnecessary comments
...
svn path=/nixos/trunk/; revision=17695
2009-10-07 12:53:59 +00:00
Rob Vermaas
06f26e1ad0
* removed unnecessary comments
...
svn path=/nixos/trunk/; revision=17694
2009-10-07 12:53:27 +00:00
Rob Vermaas
e6e3c11dba
* moved example to example attribute, changed description of sitecopy backup module
...
svn path=/nixos/trunk/; revision=17693
2009-10-07 12:52:04 +00:00
Rob Vermaas
15ffc4a296
shouldn't use <'s in description
...
svn path=/nixos/trunk/; revision=17692
2009-10-07 12:08:04 +00:00
Rob Vermaas
870b2ae68e
PostgreSQL should be MySQL
...
svn path=/nixos/trunk/; revision=17691
2009-10-07 11:58:23 +00:00
Rob Vermaas
704e56667a
added nixos modules to perform simple backup scheduling for directories, postgresql and mysql database dumps
...
svn path=/nixos/trunk/; revision=17690
2009-10-07 11:55:36 +00:00
Nicolas Pierron
9b5611e35e
Option "kde.extraPackages" is now deprecated.
...
svn path=/nixos/trunk/; revision=17682
2009-10-06 19:25:25 +00:00
Nicolas Pierron
2969f36b15
Add the computation of upstart-packages inside the job sub-module by adding
...
the option named "upstartPkg".
Move the obsolete option "services.extraJobs" to the rename module.
svn path=/nixos/trunk/; revision=17672
2009-10-06 09:30:13 +00:00
Marc Weber
7e72788a39
rewrite sshd using jobAtts serving as example
...
svn path=/nixos/trunk/; revision=17651
2009-10-05 18:31:30 +00:00
Marc Weber
d0c68bc9ab
adding jobAttrs which is filled from jobs contents
...
Purpose: Allow overwriding of properties such as:
config.jobAttrs.sshd.startOn = "never";
thanks to Nicolas Pierron for reviewing and
extending nixpkgs to make this possible
I'll convert most of the jobs ASAP so please don't care
about the depreceateion much right now
svn path=/nixos/trunk/; revision=17650
2009-10-05 18:31:27 +00:00
Rob Vermaas
0e2c160e2e
added privoxy nixos module
...
svn path=/nixos/trunk/; revision=17646
2009-10-05 15:11:32 +00:00
Eelco Dolstra
8ab6828f31
* Export the manual under system.build.manual to make it easier to
...
test (nix-build /etc/nixos/nixos -A config.system.build.manual).
svn path=/nixos/trunk/; revision=17644
2009-10-05 13:55:33 +00:00
Eelco Dolstra
e4c27acde3
* The mod_php option is no longer implemented.
...
svn path=/nixos/trunk/; revision=17578
2009-10-01 15:34:51 +00:00
Eelco Dolstra
fdab662659
* Add iproute to the system path. It was a dependency of dhclient
...
already anyway.
svn path=/nixos/trunk/; revision=17512
2009-09-29 15:43:52 +00:00
Nicolas Pierron
5c0c8a4017
Add messages inside the renaming process to force user to rename their
...
options.
Add the "deprecated" status which breaks until options are manually
renamed.
svn path=/nixos/trunk/; revision=17508
2009-09-29 15:21:36 +00:00
Nicolas Pierron
08c3069e40
Add obsolete "boot.grubSplashImage".
...
svn path=/nixos/trunk/; revision=17507
2009-09-29 15:03:08 +00:00
Eelco Dolstra
a5ad5a035e
* Firewall: by default, only log rejected TCP connections. Otherwise
...
you get a lot of garbage in the log. Also, an option to reject
instead of drop packets.
svn path=/nixos/trunk/; revision=17505
2009-09-29 14:21:56 +00:00
Nicolas Pierron
eb1ee3206e
Rename module:
...
- Improve error messages.
svn path=/nixos/trunk/; revision=17500
2009-09-29 13:44:07 +00:00
Eelco Dolstra
d142b8a13b
* Remove the ACPI actions. There's obsolete now (handled by HAL /
...
pm-utils / KDE).
svn path=/nixos/trunk/; revision=17495
2009-09-29 09:52:25 +00:00
Eelco Dolstra
636a9e7e32
* Add rename clauses for the old Grub options.
...
* Renamed some of the new Grub options to more sensible names
(e.g. extraGrubEntries to extraEntries, bootMount to bootDevice,
etc.).
svn path=/nixos/trunk/; revision=17494
2009-09-29 09:50:38 +00:00
Nicolas Pierron
c9f5889ad1
move "environment.extraPackages" into the rename module.
...
svn path=/nixos/trunk/; revision=17485
2009-09-28 18:26:18 +00:00
Nicolas Pierron
7568587e88
Add a renaming module. This module introduce the rename function to
...
fetch definitions of oldest options and to add them inside the new option.
Properties are still valid and will not be affected by the renaming. e.g:
with: rename alias "foo.bar" to "baz.quz"
and with the following module:
{
foo.bar = (mkOverride 10 {}) 42;
baz.quz = 21;
}
the result of baz.quz would be 42 because the priority is still working
after the renaming.
svn path=/nixos/trunk/; revision=17484
2009-09-28 18:26:13 +00:00
Eelco Dolstra
373445c410
* Start bluetoothd from udev.
...
svn path=/nixos/trunk/; revision=17475
2009-09-28 16:37:46 +00:00
Eelco Dolstra
647d9ba3b6
* udev: removed the /var/run/devices-created hack. It's no longer
...
needed now that we don't use pam_devperm anymore. When udev is
restarted, it now asks ConsoleKit to get the active users and sets
device ACLs accordingly.
svn path=/nixos/trunk/; revision=17474
2009-09-28 16:27:01 +00:00
Lluís Batlle i Rossell
4163ff95b4
Reverting r17459 - I had wpa_supplicant addapted to my system (nic device), and
...
I didn't want to commit that for all nixos users. We may write some day a better
wpa_supplicant solution.
svn path=/nixos/trunk/; revision=17462
2009-09-27 21:54:38 +00:00
Lluís Batlle i Rossell
b0a6c15f42
Fixing a reference to a grub in kdm, I hadn't tested before.
...
svn path=/nixos/trunk/; revision=17461
2009-09-27 21:51:47 +00:00
Lluís Batlle i Rossell
75f6cd20da
Making modular my previous changes for armv5tel. I updated the way to use
...
grub. Its options are no more inside 'boot', but inside 'boot.loader.grub'.
I added a new bootloader configuration for nixos, generationsDir. It creates
/boot/default/{init,initrd,kernel,system} symlinks, and the same for the generations
in /boot/system-$gen/{init,initrd,kernel,system}.
I can program the u-boot loader to load /boot/default files always, and have
a minimal nixos boot loader installer functionality. Additionally, I can refer
to the other system generations easily, with a simple 'ls' in /boot.
svn path=/nixos/trunk/; revision=17460
2009-09-27 21:51:37 +00:00
Lluís Batlle i Rossell
852478ff79
Making supplicant work on eth1
...
svn path=/nixos/trunk/; revision=17459
2009-09-27 21:51:22 +00:00
Nicolas Pierron
a701637f94
Use servicePath instead of relative paths.
...
svn path=/nixos/trunk/; revision=17454
2009-09-26 23:04:43 +00:00
Eelco Dolstra
c5d45514a1
* Don't restart dbus, since that causes ConsoleKit to forget about
...
current sessions.
svn path=/nixos/trunk/; revision=17452
2009-09-26 21:00:47 +00:00
Eelco Dolstra
17d0b83eef
* Enable power management support in HAL. So now you can for instance
...
suspend from within KDE.
svn path=/nixos/trunk/; revision=17451
2009-09-26 20:37:48 +00:00
Eelco Dolstra
b3818c1a77
* Add eject to the system path.
...
svn path=/nixos/trunk/; revision=17448
2009-09-26 18:57:34 +00:00
Eelco Dolstra
d933f55e45
* Tell PolicyKit about the policies of HAL and ConsoleKit.
...
svn path=/nixos/trunk/; revision=17439
2009-09-26 10:32:57 +00:00
Eelco Dolstra
693e017bfe
* HAL expects a /media directory for mounting removable media.
...
svn path=/nixos/trunk/; revision=17437
2009-09-26 10:27:47 +00:00
Eelco Dolstra
3d5462c980
* Install a PolicyKit policy configuration file. There should be a
...
configuration option to add to this file.
svn path=/nixos/trunk/; revision=17436
2009-09-26 00:07:52 +00:00
Eelco Dolstra
a83e308856
* Clean up ConsoleKit.
...
svn path=/nixos/trunk/; revision=17434
2009-09-25 23:18:52 +00:00
Eelco Dolstra
69f68c319d
* A module for the old PolicyKit.
...
svn path=/nixos/trunk/; revision=17433
2009-09-25 23:06:38 +00:00
Eelco Dolstra
684eb63658
* fsck is no longer in e2fsprogs.
...
* Don't try to remount CIFS filesystems.
* For devices specified by label, use /dev/disk/by-label instead of
LABEL=. The initrd already did this.
* Improved the flagging of pseudo devices.
svn path=/nixos/trunk/; revision=17431
2009-09-25 22:38:37 +00:00
Eelco Dolstra
530c96761a
* Start dbus after udev. Otherwise ConsoleKit may or may not
...
recognise X logins as active sessions (i.e. ck-list-sessions will
show "active = FALSE", and the user doesn't get ownership of
devices). I guess console-kit-daemon (which is started by dbus)
needs some device in /dev to exist.
svn path=/nixos/trunk/; revision=17428
2009-09-25 20:41:15 +00:00
Eelco Dolstra
3e5912833d
* For consistency with Nixpkgs.
...
svn path=/nixos/trunk/; revision=17427
2009-09-25 20:12:35 +00:00
Eelco Dolstra
38898d5304
* r17391 changed the mingetty ttys to device names instead of tty
...
numbers. This also requires kbd and tty-backgrounds to be updated
(and by extension syslogd and rogue). Also updated the style of
those modules.
svn path=/nixos/trunk/; revision=17424
2009-09-25 19:55:08 +00:00
Eelco Dolstra
69998a8d61
* libgcc_s.so is in $gcc/lib64 on x86_64-linux.
...
svn path=/nixos/trunk/; revision=17417
2009-09-25 12:34:09 +00:00
Lluís Batlle i Rossell
ff1a79ed88
Fixing the top-level expression not to boot only from uImage, but keep on
...
booting vmlinuz in non armv5tel.
svn path=/nixos/trunk/; revision=17393
2009-09-23 20:51:09 +00:00
Lluís Batlle i Rossell
8b9f510b08
Removing grub from the system expression for armv5tel-linux.
...
svn path=/nixos/trunk/; revision=17392
2009-09-23 20:51:00 +00:00
Lluís Batlle i Rossell
b2334990db
Making the mingetty module support not only vc ttys.
...
svn path=/nixos/trunk/; revision=17391
2009-09-23 20:50:53 +00:00
Lluís Batlle i Rossell
eab68acb35
Conditioning on /sys/power, and adding double patchelf for armv5tel-linux
...
svn path=/nixos/trunk/; revision=17390
2009-09-23 20:50:48 +00:00
Lluís Batlle i Rossell
7b14ee9932
Setting the files cipher algorithm depending on the architecture
...
(with libxcrypt or without libxcrypt, at the end)
svn path=/nixos/trunk/; revision=17389
2009-09-23 20:50:41 +00:00
Marc Weber
e49ea46466
nfs-kernel:
...
fix creating directories by skipping comments and interpreting quotes,
take input from ${exports} which may be different from /etc/exports
which also restarts the service in this case updating the export list
Also run rpc.statd in forground so that it doesn't get respawned
svn path=/nixos/trunk/; revision=17358
2009-09-23 00:54:09 +00:00
Michael Raskin
478dd67532
Fixing incorrect file reference
...
svn path=/nixos/trunk/; revision=17311
2009-09-20 18:48:34 +00:00
Michael Raskin
69cc6ce3ec
Refactoring modules and cleaning up a comment
...
svn path=/nixos/trunk/; revision=17310
2009-09-20 18:15:52 +00:00
Michael Raskin
de555c3705
Reduce size of iso-minimal-fresh-kernel and make it easier to install offline
...
svn path=/nixos/trunk/; revision=17301
2009-09-20 15:07:19 +00:00
Michael Raskin
9be240eaf2
Add rescue functionality
...
svn path=/nixos/trunk/; revision=17296
2009-09-20 09:50:24 +00:00
Michael Raskin
406bcd0d4f
Adding the single package needed for the offline installation
...
svn path=/nixos/trunk/; revision=17291
2009-09-20 06:00:50 +00:00
Lluís Batlle i Rossell
67fa5622bf
Adding support for the nvidia legacy drivers (videoDriver = "nvidiaLegacy")
...
svn path=/nixos/trunk/; revision=17285
2009-09-19 22:09:29 +00:00
Michael Raskin
a574ae095a
Fresh kernel means fresh kernel!
...
svn path=/nixos/trunk/; revision=17272
2009-09-19 11:09:22 +00:00
Lluís Batlle i Rossell
4670b1318a
Adding support for the rt73 usb wifi nic firmware loading.
...
svn path=/nixos/trunk/; revision=17264
2009-09-18 20:49:12 +00:00
Nicolas Pierron
2ebd1252aa
Fix typo.
...
svn path=/nixos/trunk/; revision=17260
2009-09-18 15:47:02 +00:00
Nicolas Pierron
0e3981213f
Add an option to change the policy of source file links inside the manual.
...
The default policy use local files instead of remote ones.
svn path=/nixos/trunk/; revision=17258
2009-09-18 15:27:10 +00:00
Eelco Dolstra
70a10c1720
* In the generation of machines.nix, support specifying a
...
speed factor and multiple system types.
svn path=/nixos/trunk/; revision=17231
2009-09-17 16:22:26 +00:00
Rob Vermaas
bd6fbce0f3
* vsftpd typo
...
svn path=/nixos/trunk/; revision=17215
2009-09-17 07:39:21 +00:00
Michael Raskin
3202022355
Adding an updated iso_minimal version
...
svn path=/nixos/trunk/; revision=17186
2009-09-16 12:31:23 +00:00
Rob Vermaas
bb8c6b038d
* use new job style for ddclient upstart
...
svn path=/nixos/trunk/; revision=17184
2009-09-16 11:57:41 +00:00
Rob Vermaas
44f99c64d4
* added ddclient module to allow synchronization of machine's ip address with dynamic dns provider
...
svn path=/nixos/trunk/; revision=17180
2009-09-16 11:22:45 +00:00
Michael Raskin
b9079b8da9
Returning selinux=0: convenient with allmodconfig
...
svn path=/nixos/trunk/; revision=17179
2009-09-16 11:03:15 +00:00
Rob Vermaas
185c8a3884
* add uptimed to system packages
...
svn path=/nixos/trunk/; revision=17175
2009-09-16 08:01:03 +00:00
Rob Vermaas
ba1a9aecfd
* added uptimed module, default disabled
...
svn path=/nixos/trunk/; revision=17174
2009-09-16 07:49:23 +00:00
Rob Vermaas
9587192c68
* added uptimed module
...
svn path=/nixos/trunk/; revision=17173
2009-09-16 07:48:47 +00:00
Nicolas Pierron
10e9705a86
Replace optionDeclarations by options which is directly computed by
...
moduleMerge.
svn path=/nixos/trunk/; revision=17166
2009-09-15 14:09:18 +00:00
Nicolas Pierron
36573e5e5c
Convert module which are declaring options into modules separated with an
...
"options" set to declare options and a "config" set to define options.
svn path=/nixos/trunk/; revision=17148
2009-09-15 08:33:45 +00:00