Mathijs Kwik
7e70cffc45
systemd mount units: better handling of mandatory options
2013-01-01 14:53:54 +01:00
Mathijs Kwik
ebf4816717
systemd mount units: use 'escapeSystemdPath' from lib/utils
2013-01-01 14:53:54 +01:00
Mathijs Kwik
16a9bcfe81
add support for systemd mount units
...
This is mainly useful for specifying mounts that depend on other
units. For example sshfs or davfs need network (and possibly
nameservices).
While systemd makes a distinction between local and remote
filesystems, this only works for in-kernel filesystems such as
nfs and cifs.
fuse-based filesystems (such as sshfs and davs) are classified as
local, so they fail without networking. By explicitly declaring these
mounts as full systemd units (as opposed to having systemd generate
them automatically from /etc/fstab), dependencies can be specified as
on every other unit.
In the future, we can probably port NixOS' filesystems handling to use
these native systemd.mount units and skip /etc/fstab altogether, but
this probably requires additional changes, such as starting systemd
even earlier during boot (stage 1).
2013-01-01 13:55:48 +01:00
Rickard Nilsson
19e8ffc43f
networkmanager: Use systemctl instead of initctl
2012-12-30 19:30:18 +01:00
Mathijs Kwik
183829cf99
gogoclient: change working dir before starting
...
otherwise state files are placed in /
2012-12-28 10:22:49 +01:00
Mathijs Kwik
244ed6ae71
nscd: use proper systemd.special(7) targets
2012-12-27 12:23:50 +01:00
Mathijs Kwik
3456f3b232
systemd: convert gogoclient job to service unit
2012-12-27 12:23:50 +01:00
Mathijs Kwik
f61f0c139b
systemd: convert smartd job to service
2012-12-27 12:23:50 +01:00
Mathijs Kwik
dc58c2ea37
systemd: convert samba jobs to systemd services (samba.target)
2012-12-27 12:23:50 +01:00
Mathijs Kwik
90fa68cf32
systemd: convert mongodb job to service
2012-12-27 12:23:50 +01:00
Eelco Dolstra
45f0de21f0
nixos-rebuild: Fix the check for running nix-daemon
2012-12-21 00:18:12 +01:00
Eelco Dolstra
fb8af2f9b6
postgresql: Don't wait for ages in post-start if the service has failed
2012-12-21 00:18:12 +01:00
Shea Levy
3ef1432866
Update create-s3-amis and amazon-image.nix to recent nixos
2012-12-18 13:44:47 -05:00
Eelco Dolstra
ab18c03685
mysql55: Port to systemd
...
Not tested. Seriously tempted to delete mysql55. See issue #47 .
2012-12-18 13:45:25 +01:00
Eelco Dolstra
75c67b0194
mysql: Port to systemd
2012-12-18 13:45:25 +01:00
Eelco Dolstra
251f8546c9
pam_ssh_agent_auth: Use /etc/ssh/authorized_keys.d
2012-12-17 21:14:09 +01:00
Shea Levy
dd131a0c09
Revert "Setting the system utillinux to be utillinuxCurses."
...
This reverts commit cba4d20280
2012-12-17 13:09:05 -05:00
Shea Levy
75ec5c609e
Merge remote-tracking branch 'upstream/master' into systemd
...
Conflicts:
maintainers/scripts/ec2/create-ebs-amis.py
2012-12-17 13:03:56 -05:00
Shea Levy
835ee30b32
Merge branch 'no-aufs' into systemd
2012-12-17 13:02:35 -05:00
Lluís Batlle i Rossell
358239348a
making memtest grub entries work again
...
I'm not any good at perl, and I only came up with this after many
slow attempts. Any review welcome.
But until this, memtest was broken, and extraPrepareConfig as well, in grub.
2012-12-16 21:41:47 +01:00
Rob Vermaas
39a6143c66
Add options to control rate limiting behaviour of journald. See 'man journald.conf' for more information.
2012-12-16 20:28:45 +01:00
Shea Levy
dfca6b97f1
Remove last mention of aufs for completeness
2012-12-16 13:33:23 -05:00
Shea Levy
ae4c8e3e0b
nova-image.nix: Replace the commented-out aufs mount with a commented-out unionfs-fuse mount
2012-12-16 13:31:44 -05:00
Shea Levy
ac9002ce18
amazon-image: use unionfs-fuse instead of aufs
2012-12-16 13:16:17 -05:00
Shea Levy
d19c223ba6
Simplify unionfs-chroot bind-mounting
2012-12-16 13:07:42 -05:00
Shea Levy
e34024d998
Refactor common unionfs-fuse initrd prep into a separate module
2012-12-16 12:33:36 -05:00
Lluís Batlle i Rossell
3e734ba695
Qemu says 'boot=on' is deprecated, so I try a half-fix here
...
I change the 'build-vm' to use '-boot menu=on', so a menu displays and allows
choosing the 2nd hd. Otherwise, I don't know how to boot from a 2nd hd.
2012-12-16 18:07:13 +01:00
Shea Levy
3eb0faf317
qemu-vm: Use unionfs-fuse instead of aufs for writableStore
2012-12-16 11:56:49 -05:00
Shea Levy
be4f69519b
iso-image: Use unionfs-fuse instead of aufs
2012-12-16 11:31:52 -05:00
Lluís Batlle i Rossell
dacd7d5a58
Setting iso_new_kernel to use linux 3.7.
...
It was using 3.2, the same kernel as the other isos.
2012-12-16 16:05:50 +01:00
Lluís Batlle i Rossell
cba4d20280
Setting the system utillinux to be utillinuxCurses.
...
The live-dvd was set that way already.
I think some utillinux pieces may be nicer, or have more tools. I don't know
the details though.
2012-12-16 16:03:38 +01:00
Florian Friesdorf
14483c0bf9
update nixos channel path
2012-12-14 18:24:41 +01:00
Eelco Dolstra
bd7ea9be58
sysinit.target: Drop the dependency on local-fs.target and swap.target
...
Having all services with DefaultDependencies=yes depend on
local-fs.target is annoying, because some of those services might be
necessary to mount local filesystems. For instance, Charon's
send-keys feature requires sshd to be running in order to receive LUKS
encryption keys, which in turn requires dhcpcd, and so on. So we drop
this dependency (and swap.target as well for consistency). If
services require a specific mount, they should use RequiresMountsFor
in any case.
2012-12-14 17:42:54 +01:00
Eelco Dolstra
5437424297
Hackery to build against both the nixpkgs master and systemd branch
2012-12-13 15:04:09 +01:00
Rob Vermaas
859badc966
Zabbix agent: RemainAfterExit=true seems to give more reliable restarts, cannot completely figure out why, as Type=forking should be enough.
2012-12-11 20:54:19 +01:00
Eelco Dolstra
97ae408e83
Merge remote-tracking branch 'origin/master' into systemd
2012-12-11 17:40:39 +01:00
Eelco Dolstra
78bd54ca80
Allow setting additional AuthorizedKeysFiles
...
Charon needs this to include the dynamically generated
/root/.vbox-charon-client-key. (We used
users.extraUsers.root.openssh.authorizedKeys.keyFiles for this, but
that no longer works.)
2012-12-11 17:29:34 +01:00
Eelco Dolstra
eda051cff5
Remove abuse of "with"
2012-12-11 17:14:52 +01:00
Rickard Nilsson
68872f81cf
openssh: Change the way authorized keys are added to the system.
...
Instead of the somewhat hacky script that inserted public keys
into the users' .ssh/authorized_keys files, use the AuthorizedKeysFile
configuration directive in sshd_config and generate extra key
files for each user (placed in /etc/authorized_keys.d/).
2012-12-11 17:02:39 +01:00
Eelco Dolstra
3224ea8a1e
Don't require nixUnstable
2012-12-11 13:14:33 +01:00
Eelco Dolstra
745a201814
Check whether /proc/sys/net/ipv6/conf/all/disable_ipv6 exists
2012-12-11 13:14:17 +01:00
Eelco Dolstra
13617b803b
Use the binary cache in the installer
...
Also remove "nixos-rebuild pull".
2012-12-08 19:00:06 +01:00
Eelco Dolstra
ef3199f782
Add options for specifying binary caches
...
Cherry-picked a4bcb26b1a
2012-12-08 18:37:40 +01:00
Evgeny Egorochkin
860cbf7890
scanner support: create scanner group. Users need to be in this group to access scanners.
2012-12-06 02:59:34 +02:00
Evgeny Egorochkin
15a15be2f6
dhcpcd: disable "require dhcp_server_identifier" because of so many non-compliant DHCP servers
2012-12-05 23:55:42 +02:00
Eelco Dolstra
b1da38f564
Merge remote-tracking branch 'origin/master' into systemd
2012-11-30 16:12:04 +01:00
Eelco Dolstra
7435db4f89
Get rid of the last uses of mkAlways
...
mkAlways is an insane function, mkMerge is much saner.
2012-11-30 15:07:39 +01:00
Eelco Dolstra
3c6e0fd594
Generate the binary hardware database required by systemd 196
2012-11-29 18:51:44 +01:00
Eelco Dolstra
9eb81d2578
Renamed tcpWrapper -> tcp_wrappers
2012-11-29 15:16:30 +01:00
Lluís Batlle i Rossell
04963cf802
system-tarball-pc: fixing the readme inclusion
2012-11-29 11:29:15 +01:00
