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
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