Eelco Dolstra
ad94b9e50e
Use optionalAttrs
2012-10-10 16:49:47 -04:00
Eelco Dolstra
6902452901
Whitespace
2012-10-09 15:14:32 -04:00
Eelco Dolstra
d71c0bb834
Respect partOf etc. for socket and target units
2012-10-09 15:14:15 -04:00
Eelco Dolstra
dd3fe9d792
Merge remote-tracking branch 'origin/master' into systemd
...
Conflicts:
modules/services/system/nscd.nix
2012-10-08 13:47:37 -04:00
Eelco Dolstra
f451afea8f
Remove ‘services.journald.logKernelMessages’
...
This option no longer exists in systemd.
2012-10-08 10:51:17 -04:00
Eelco Dolstra
2b2f0067b8
Add an /etc/hosts entry mapping localhost to ::1
2012-10-07 00:46:24 -04:00
Eelco Dolstra
570e523a88
Remove 127.0.0.1 mapping for the system's hostname
...
Also remove the <hostname>.<domain> mapping.
2012-10-07 00:40:00 -04:00
Eelco Dolstra
74295866f5
Don't include NSS modules in $LD_LIBRARY_PATH
...
This is broken because it requires restarting applications to see new
NSS modules. The proper way to handle NSS modules is through nscd.
See commit 554ae9908b
.
2012-10-07 00:37:36 -04:00
Eelco Dolstra
13841d6e47
Use nss-myhostname to ensure that the hostname resolves to something sensible
2012-10-06 21:00:26 -04:00
Eelco Dolstra
757ab7f6d3
Generate nsswitch.conf properly
2012-10-06 20:58:46 -04:00
Eelco Dolstra
dd1770bf0b
Enable klogd on Linux < 3.5
...
On Linux >= 3.5, systemd takes care of logging kernel messages.
2012-10-05 13:44:15 -04:00
Eelco Dolstra
a5969634f4
sshd: Do detach into the background
...
This is necessary to ensure that jobs that need to start after sshd
work properly.
This reverts 03f13a4939
.
2012-10-04 23:38:27 -04:00
Eelco Dolstra
98c6c5b730
fetch-ec2-data: Update for systemd
2012-10-04 23:26:19 -04:00
Eelco Dolstra
892b3f6ad6
acpid: Skip (rather than fail) if /proc/acpi doesn't exist
...
E.g. EC2 instances don't have ACPI.
2012-10-04 23:26:01 -04:00
Eelco Dolstra
0ddd147cfc
headless.nix: Mountall is gone
2012-10-04 23:25:33 -04:00
Eelco Dolstra
5d9b3ed12b
scsi-link-pm: Don't fail if there are no matching SCSI hosts
2012-10-04 23:25:11 -04:00
Eelco Dolstra
8f4d8cf620
Enable the power management module by default
...
After all, we don't want NixOS machines to contribute to global
warming more than necessary!
2012-10-04 22:10:35 -04:00
Eelco Dolstra
9b431cb24e
upower: Work around the daemon getting stuck after a suspend
2012-10-04 21:58:40 -04:00
Eelco Dolstra
7d26dde69a
Oops, systemd-inhibit should be exec'ed
2012-10-04 21:58:20 -04:00
Eelco Dolstra
52483c36bb
Lowercase debug output
2012-10-04 21:44:45 -04:00
Eelco Dolstra
db2a4d144e
xsession: Set a inhibitor to prevent systemd from handling the power button and lid
2012-10-04 21:44:24 -04:00
Eelco Dolstra
c6d12257f1
systemd: Run the powerManagement.* hooks on suspend/resume
...
Also, drop pm-utils. Systemd now takes care of suspend/resume.
2012-10-04 17:57:10 -04:00
Eelco Dolstra
38229da940
upower: Add glib to $PATH
...
The upower daemon needs the gdbus command (which is weird given that
upower links against dbus_glib, but ah well...). This fixes suspend
in KDE with systemd.
2012-10-04 16:38:31 -04:00
Eelco Dolstra
fdea3ac3d2
stage-2-init: Don't rely on groups being initialised
2012-10-04 16:15:30 -04:00
Eelco Dolstra
6c6134c2d2
Fix the manual service on the installation CD
2012-10-04 16:15:10 -04:00
Eelco Dolstra
74be2d9707
ISO image: Fix graphical GRUB menu
2012-10-04 16:14:44 -04:00
Eelco Dolstra
8dc4f2c3be
Fix the rogue service for systemd
2012-10-04 15:27:31 -04:00
Eelco Dolstra
13a5ebad32
Update some tests for systemd
2012-10-04 12:34:44 -04:00
Eelco Dolstra
02624758b1
Use udev to restore ALSA volume settings
...
Alsa-utils provides a udev rule to restore volume settings, so use
that instead of restoring them from a systemd service. The
"alsa-store" service saves the settings on shutdown.
2012-10-02 11:09:54 -04:00
Eelco Dolstra
666620cdd5
Use ‘mountpoint -q’
2012-10-02 10:32:56 -04:00
Eelco Dolstra
2044ae785d
Use "wants" instead of "requires"
2012-10-02 10:32:29 -04:00
Eelco Dolstra
7932978617
Fix Upstart compatibility jobs that depend on "stopped udevtrigger"
...
It's not enough to say "after udev-settle.service" since
udev-settle.service is not wanted/required anywhere - we need to say
"wants udev-settle.service" as well.
This should fix problems with ALSA and X11 initialisation that people
have been seeing.
2012-10-02 10:31:02 -04:00
Eelco Dolstra
2cf5e3cb66
Add options ‘boot.systemd.targets’ and ‘boot.systemd.sockets’
2012-10-01 18:58:11 -04:00
Eelco Dolstra
ca13a913d9
Oops, lost some code
2012-10-01 18:20:22 -04:00
Eelco Dolstra
990ec8cc4e
Decrease PostgreSQL start check interval
2012-10-01 17:32:03 -04:00
Eelco Dolstra
2326c6da2b
postgresql.nix: Depend on the filesystem containing the database
2012-10-01 16:53:13 -04:00
Eelco Dolstra
5cf702e1c1
postgresql.nix: Use User/Group instead of su
2012-10-01 16:49:02 -04:00
Eelco Dolstra
13d747c11a
Support postStart scripts in service units
2012-10-01 16:45:49 -04:00
Eelco Dolstra
891be375b5
Make unitConfig/serviceConfig attribute sets
...
So instead of:
boot.systemd.services."foo".serviceConfig =
''
StartLimitInterval=10
CPUShare=500
'';
you can say:
boot.systemd.services."foo".serviceConfig.StartLimitInterval = 10;
boot.systemd.services."foo".serviceConfig.CPUShare = 500;
This way all unit options are available and users can set/override
options in configuration.nix.
2012-10-01 16:27:42 -04:00
Eelco Dolstra
440b793a5b
Remove ‘autocreate’ FS option
...
Systemd creates missing mountpoints unconditionally.
2012-10-01 14:34:39 -04:00
Eelco Dolstra
353522ef79
Remove JoinControllers line because upstream reverted joining cpuset
2012-10-01 14:33:01 -04:00
Peter Simons
4b78161e3e
dovecot: add options to selectively enable/disable the IMAP and/or POP3 listener
2012-09-30 00:54:03 +02:00
Mathijs Kwik
1b47614c46
invalidate-nscd: use script instead of exec for multiple commands
...
otherwise, only the first one line executes
2012-09-29 10:51:28 +02:00
Eelco Dolstra
0c4c3fc8aa
Merge branch 'systemd' of github.com:NixOS/nixos into systemd
2012-09-28 11:41:59 -04:00
Peter Simons
03f13a4939
Tell sshd not to detach into the background.
...
This makes it easier for systemd to track it and avoids race conditions such as
this one:
systemd[1]: PID file /run/sshd.pid not readable (yet?) after start.
systemd[1]: Failed to start SSH Daemon.
systemd[1]: Unit sshd.service entered failed state.
systemd[1]: sshd.service holdoff time over, scheduling restart.
systemd[1]: Stopping SSH Daemon...
systemd[1]: Starting SSH Daemon...
sshd[2315]: Server listening on 0.0.0.0 port 22.
sshd[2315]: Server listening on :: port 22.
sshd[2335]: error: Bind to port 22 on 0.0.0.0 failed: Address already in use.
sshd[2335]: error: Bind to port 22 on :: failed: Address already in use.
sshd[2335]: fatal: Cannot bind any address.
systemd[1]: Started SSH Daemon.
2012-09-28 17:38:24 +02:00
Peter Simons
fabe06337e
alsa.nix: initialize the sound card before restoring previously stored settings
...
The sound card in my ThinkPad won't work unless "init" is run explicitly.
2012-09-28 17:38:24 +02:00
Eelco Dolstra
3ad370ae0a
Merge remote-tracking branch 'origin/master' into systemd
...
Conflicts:
modules/misc/ids.nix
modules/services/mail/postfix.nix
modules/services/system/nscd.nix
modules/services/x11/desktop-managers/xfce.nix
modules/system/boot/stage-1.nix
2012-09-28 11:35:27 -04:00
Eelco Dolstra
1084a8e0de
Add "adm" group from the systemd branch to prevent constant collisions
2012-09-28 11:14:33 -04:00
Eelco Dolstra
3e6bb7d1de
Move setting ownership of /nix/store to stage-2-init
...
This is necessary because the store might be bind-mounted read-only.
2012-09-28 10:59:58 -04:00
Peter Simons
6f052ee62e
spamassassin: use virtual user home directories under /var/lib/spamassassin to avoid permission problems
...
When spamd isn't running as 'root', it cannot access the usual ~/.spamassassin
path where user-specific files normally reside. Instead, we use the path
/var/lib/spamassassin-<user> to store those home directories.
2012-09-28 00:06:52 +02:00