Eelco Dolstra
f701acfac0
nix-daemon: Start "nix-daemon" rather than "nix-worker --daemon"
2013-01-04 13:50:50 +01:00
Rob Vermaas
207d30b6f3
Fix VirtualBox image generation: switch-to-configuration in chroot needs /bin/sh
2013-01-04 10:58:56 +01:00
Eelco Dolstra
9aa69885f0
Don't do readlink() on every mount point when remounting /dev etc.
...
Doing so causes the activation script to hang if (say) an NFS mount
point is unreachable.
2013-01-02 18:28:44 +01:00
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
a3ee9aac98
efi-boot-stub: enable hook for running (fixup) commands after efibootmgr run
2013-01-01 14:05:08 +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
Tim Dysinger
6961f5048d
add vboxsf group (for automatic mounting of shared folders)
2012-12-31 11:00:02 -10:00
Rickard Nilsson
19e8ffc43f
networkmanager: Use systemctl instead of initctl
2012-12-30 19:30:18 +01:00
Michael Raskin
9b7ce4a1b5
Merge pull request #50 from surr/fixes/tzdata
...
timezone should be taken from recent tzdata rather than glibc
2012-12-29 10:29:21 -08:00
viric
af4db2a79c
Merge pull request #57 from cpages/master
...
Add support for nvidia legacy 304 to xserver
2012-12-29 10:23:10 -08: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
Lluís Batlle i Rossell
ceedc50009
Fixing the fuloong2f system tarball
2012-12-22 18:46:15 +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
Alexander Inyukhin
1ae44e42ed
Use zoneinfo from tzdata
...
This fixes #50
2012-12-15 22:05:32 +04: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
Carles Pagès
e312df06f0
Add support for nvidia 304.xx drivers in xserver.
...
Those were already in nixpkgs, but not supported in xserver. Since some time
ago the current 310.xx dropped support for some not so new cards.
2012-12-13 11:36:18 +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
Lluís Batlle i Rossell
a9e5d1ab50
Changing the kernel parameters for crashump
...
I think that these enable more checks, and make more NMIs happen.
2012-11-29 11:27:33 +01:00
Peter Simons
6b6b245693
sane: update name of the snapshot version of the backends
2012-11-26 16:21:11 +01:00
Peter Simons
403dc16c51
sane: update name of the snapshot version of the backends
2012-11-26 16:20:29 +01:00
Shea Levy
a5ef0ffe12
rngd: Require /dev/random, only start when a hardware randomness source becomes available
2012-11-26 08:45:23 -05:00
Eelco Dolstra
f3c9c83e04
Make it easier to append to the default sudo configuration
2012-11-23 15:14:16 +01:00
Shea Levy
e76eb7f1a7
Disable rngd by default while I work on some patches to make it more systemd-friendly
2012-11-22 10:14:41 -05:00
Eelco Dolstra
994a15bc25
nixos-rebuild: Handle options with spaces in them
...
Like ‘--option binary-caches "http://foo http://bar "’
2012-11-22 12:04:00 +01:00
Eelco Dolstra
a4bcb26b1a
Add options for specifying binary caches
2012-11-22 11:49:47 +01:00
Eelco Dolstra
77891f8d59
Typo
2012-11-22 10:41:54 +01:00
Shea Levy
cd513482d4
Add rngd service.
...
Inspired by http://pkgs.fedoraproject.org/cgit/rng-tools.git/tree/rngd.service?id=27b1912b2d9659b6934fd4c887e46c13958e7e3c
2012-11-22 02:07:25 -05:00
Rob Vermaas
f0a6911929
Add ec2.metadata (default false) option whether to allow access to EC2 metadata API.
2012-11-21 12:19:38 -05:00
Peter Simons
0f15d75017
Merge pull request #29 from rickynils/shellaliases
...
Generate shell aliases programatically
2012-11-20 12:35:03 -08:00
Rickard Nilsson
6099451662
Add support for nslcd (nss-pam-ldapd) as users.ldap.daemon option
2012-11-20 16:39:45 +01:00
Rickard Nilsson
611ebeb1d0
Add nslcd (nss-pam-ldapd) uid and gid
2012-11-20 16:39:45 +01:00
Rickard Nilsson
a22c362155
Add option for specifying shell aliases, environment.shellAliases.
2012-11-20 16:33:29 +01:00
James Cook
3afa5f86c1
Fixed the documentation for programs.ssh.forwardX11 to account for the X11 SECURITY extension.
2012-11-18 11:05:18 -08:00
James Cook
63dc873b85
Merge master.
2012-11-18 10:49:55 -08:00
Eelco Dolstra
60bf4c3cd7
Add a GRUB 1 dependency
...
http://hydra.nixos.org/build/3331139
2012-11-16 16:42:45 +01:00
Eelco Dolstra
722a3a7147
Remove unnecessary (AFAICT) call to toPath
2012-11-15 23:07:05 +01:00
Eelco Dolstra
35922e61d9
Systemd requires the latest Nix
2012-11-15 22:55:36 +01:00
Eelco Dolstra
1f401a0e35
Make install-grub.pl work when $PATH is empty
2012-11-15 22:54:43 +01:00
Eelco Dolstra
f44d27a96c
Make the installer work on systemd
...
Systemd mounts the root filesystem as a shared subtree, which breaks
recursive bind mounts.
2012-11-15 22:53:57 +01:00
Rickard Nilsson
02e0d7dbc3
dnsmasq: Add extraConfig option
2012-11-12 18:16:04 +01:00
Eelco Dolstra
08e6c0cb7c
Update channel URLs
2012-11-12 09:19:25 +01:00
Eelco Dolstra
1350816199
test-instrumentation.nix: Don't start agetty on hvc0
2012-11-12 09:19:25 +01:00
Peter Simons
622a652411
Add option "environment.binsh" to configure the shell executable used to create the global /bin/sh symlink.
2012-11-11 21:46:25 +01:00
Peter Simons
04ba5de70a
modules/programs/bash/bash.nix: cosmetic indention fix
2012-11-11 21:29:33 +01:00
Shea Levy
2f833bc88d
Remove unnecessary toPath that breaks with recent nixUnstable
2012-11-08 13:04:20 -05:00
Eelco Dolstra
e078117c72
firewall.nix: Don't fail if IPv6 is disabled
2012-11-06 22:55:25 +01:00
aszlig
a333f7212e
systemd: Fail if kernel features are missing.
...
This has rendered my system unbootable, because I forgot to enable AUTOFS4 in my
custom kernel. In addition to AUTOFS4, this includes (hopefully) all other
kernel features needed by systemd, as listed in the README:
REQUIREMENTS:
Linux kernel >= 2.6.39
with devtmpfs
with cgroups (but it's OK to disable all controllers)
optional but strongly recommended: autofs4, ipv6
Autofs4 is not a requirement here, but in our case it turns out that the system
is not able to boot properly with a LUKS-enabled system (or at least not on _my_
system).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-11-06 11:25:43 +01:00
Peter Simons
70e6e19f54
xsession: source /etc/profile at the beginning of the script
...
The xsession script runs services that depend on a sane environment. Gpg-agent, for
example, runs the program "pinentry-gtk-2" to obtain the password to unlock GnuPG
and SSH keys. That program will display only gibberish unless $FONTCONFIG_FILE is
configured properly. Instead of configuring these variables explicitly one by one,
we just source /etc/profile, which contains the appropriate @shellInit@ code.
2012-11-05 23:07:53 +01:00
aszlig
1c28b86749
pam: Douchebag commit, fix alphabetical order.
...
Yes, I'm going to get back to school and learn the alphabet. I promise!
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-11-05 09:41:24 +01:00
aszlig
6e6ee3278c
pam: Add default configuration for GNU screen.
...
This is needed in order to properly lock your screen using the C-a C-x
(lockscreen) command _and_ being back to re-login, because the "other" PAM
service/fallback is to deny authentication.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-11-05 09:40:15 +01:00
Lluís Batlle i Rossell
64540fb453
Adding quick instructions in system-tarball-pc to use it as chroot.
...
I also split the readme into a file apart.
2012-11-04 22:13:19 +01:00
Eelco Dolstra
458f36f5f1
Turn fileSystems into an attribute set
...
So now you can write
fileSystems =
[ { mountPoint = "/";
device = "/dev/sda1";
}
];
as
fileSystems."/".device = "/dev/sda1";
2012-11-02 18:02:12 +01:00
Eelco Dolstra
97f087cd44
Turn networking.interfaces into an attribute set
...
Thus
networking.interfaces = [ { name = "eth0"; ipAddress = "192.168.15.1"; } ];
can now be written as
networking.interfaces.eth0.ipAddress = "192.168.15.1";
The old notation still works though.
2012-11-02 17:08:11 +01:00
Eelco Dolstra
93f82dfeef
Remove outdated comment about EC2 booting into stage-2 directly
2012-11-02 17:07:53 +01:00
Eelco Dolstra
67de234e1c
wpa_supplicant.nix: Slightly improve descriptions
2012-11-02 17:05:30 +01:00
Eelco Dolstra
6ae0b3beed
dhcpcd: Don't use --background so that fetch-ec2-data can be ordered after it
2012-11-02 14:20:05 +01:00
Eelco Dolstra
af4e176c12
Fix description
2012-11-02 14:10:06 +01:00
Eelco Dolstra
48a0ea0513
Make Apache wait for ‘charon send-keys’
...
(This is a no-op on non-Charon deployments since the ‘keys.target’
unit won't have any dependencies.)
2012-11-01 23:32:12 +01:00
Eelco Dolstra
dd7edefb2c
Order mkfs services before the corresponding fsck services
2012-10-31 14:49:09 +01:00
Eelco Dolstra
1860badbeb
dhcpcd: Go into the background immediately
2012-10-31 14:24:51 +01:00
Eelco Dolstra
f293455474
dhcpcd: Don't duplicate log messages
...
Dhcpcd writes log messages to both syslog and stderr. So ignore
stderr.
2012-10-31 14:24:22 +01:00
Eelco Dolstra
1da362b34b
Fix coverage data collection
...
http://hydra.nixos.org/build/3253046
2012-10-30 17:27:14 +01:00
Eelco Dolstra
bcdc71ddae
Kill the backdoor more forcefully
...
Otherwise it hangs until the 90 second timeout expires.
http://hydra.nixos.org/build/3253068
2012-10-30 16:42:05 +01:00
Rob Vermaas
8caceffae8
Logstash: fix typo, should have tested.
2012-10-30 14:22:14 +01:00
Rob Vermaas
631fce3c6f
Logstash: pass TZ, redirect log output to prevent recursion when using syslogd.
2012-10-30 14:18:51 +01:00
Rob Vermaas
2b19856f40
Logstash: do not always log to stdout
2012-10-30 14:09:30 +01:00
Eelco Dolstra
4143ff2280
In headless deployments, don't start agetty on the console
2012-10-30 13:53:36 +01:00
Rob Vermaas
88a9d7a9ca
Added environment.promptInit to allow PS1 overriding. Would be nicer to be able to allow overriding via shellInit, however could not get that to work. For now this is a temporary solution which will not break anything.
2012-10-30 13:33:37 +01:00
Eelco Dolstra
1a82024dd8
In the tests, don't start agetty on /dev/ttyS0
...
Running agetty on ttyS0 interferes with the backdoor, which uses ttyS0
as its standard error. After agetty starts, writes to the stderr file
descriptor will return EIO (though doing "exec 2>/proc/self/fd/2" will
miracuously fix this).
http://hydra.nixos.org/build/3252782
2012-10-29 21:10:00 +01:00
Eelco Dolstra
4764848314
Remove some obsolete options
2012-10-29 21:10:00 +01:00
Peter Simons
b1fefb8834
modules/programs/ssh.nix: strip trailing whitespace
2012-10-29 17:10:46 +01:00
Peter Simons
307644e3b0
modules/programs/ssh.nix: simplify expression that generates 'ForwardX11' entry
2012-10-29 17:10:37 +01:00
Peter Simons
9c74f9a51b
modules/programs/ssh.nix: configure AddressFamily properly
...
Explicitly restrict ssh clients to use of IPv4 addresses if IPv6 support is not enabled.
2012-10-29 17:10:17 +01:00
Peter Simons
cd372c62ea
modules/services/networking/ssh/sshd.nix: configure AddressFamily properly
...
Explicitly restrict sshd to use of IPv4 addresses if IPv6 support is not enabled.
2012-10-29 12:46:30 +01:00
Eelco Dolstra
ae861c8e33
Undo accidental commit
2012-10-29 12:44:38 +01:00
Eelco Dolstra
390f5f7376
Remove the cgroups module
...
Cgroups are handled by systemd now. Systemd's cgroup support does not
do all the things that cgrulesengd does, but they're likely to
interact poorly with each other.
2012-10-26 19:36:59 +02:00
Eelco Dolstra
65eae4dd34
Update libvirt for systemd
2012-10-26 16:22:19 +02:00
Eelco Dolstra
23390147ea
upstart.nix: Treat "daemon" as "forking"
2012-10-26 16:22:19 +02:00
Eelco Dolstra
6705358ede
Convert Zabbix agent/server to systemd
...
Note all the crap systemd doesn't need :-)
2012-10-26 16:22:19 +02:00
Eelco Dolstra
b3c5d42b1d
Don't create /var/log/upstart
2012-10-26 16:22:18 +02:00
Lluís Batlle i Rossell
82d39c9ca4
Fixing stage1 about getting a shell with job control in case of error
...
It's a busybox faq:
http://www.busybox.net/FAQ.html#job_control
2012-10-24 21:49:10 +02:00
Lluís Batlle i Rossell
c76fc27aff
dnsmasq: Setting fixed order in DNS name resolution.
...
That fits better my setup; if anyone doesn't need this, we can write an option
for the fixed order queries.
2012-10-24 19:29:39 +02:00
Peter Simons
b43e219aeb
modules/services/networking/ssh/sshd.nix: configure AddressFamily properly
...
Explicitly restrict sshd to use of IPv4 addresses if IPv6 support is not enabled.
2012-10-24 19:01:38 +02:00
Eelco Dolstra
b6f9e05269
Update NFS client/server modules for systemd
2012-10-24 18:10:58 +02:00
Eelco Dolstra
2d9258da67
auto.nix: Use SLiM to implement auto-logins
2012-10-24 12:31:02 +02:00
Vladimír Čunát
a392468245
Merge pull request #39 from MarcWeber/fixes/ati-proprietary
...
making ati proprietary drivers work again
2012-10-24 02:59:38 -07:00
Eelco Dolstra
224c825a36
Add option ‘users.motd’ for setting a message of the day shown on login
...
Note that this uses pam_motd.
2012-10-23 09:10:48 -04:00
Eelco Dolstra
c980faebe2
upstart.nix: Set ‘Type’ to ‘oneshot’ for Upstart tasks
...
This way the service will only reach the "started" state when the task
has finished.
2012-10-23 08:30:50 -04:00
Eelco Dolstra
e5fa3f108e
Set uniqueness constraint on boot.devShmSize etc.
2012-10-23 07:50:23 -04:00
Eelco Dolstra
7efde0740e
Add user option ‘isAlias’ to allow one user account to alias another
2012-10-23 13:35:06 +02:00
Jack Cummings
1cbad692c3
Add an option to add 'option=single-request' to /etc/resolv.conf.
2012-10-21 21:49:21 -07:00
Eelco Dolstra
c8628e0293
Don't let interfaces get IPv6 addresses if networking.enableIPv6 is false
2012-10-19 15:41:01 -04:00
Eelco Dolstra
ac8db6fd33
firewall.nix: Don't fail if IPv6 is disabled
2012-10-19 15:21:06 -04:00
Eelco Dolstra
06cbe62537
switch-to-configuration: Support services activated by multiple sockets
2012-10-18 13:26:47 -04:00
Eelco Dolstra
b4a1893cdd
systemd-vconsole-setup: Don't put the X server in non-raw mode
...
‘systemd-vconsole-setup’ by default operates on /dev/tty0, the
currently active tty. Since it puts /dev/tty0 in Unicode or ASCII
mode, if the X server is currently active when it runs, keys such as
Alt-F4 won't reach the X server anymore. So use /dev/tty1 instead.
2012-10-18 11:58:37 -04:00
Eelco Dolstra
a4cad32c3d
Generate more user-friendly script filenames
...
This is primarily important in journal entries.
2012-10-18 11:58:37 -04:00
Peter Simons
7d58132c0a
Merge pull request #36 from jcumming/hostapd
...
hostapd module
2012-10-18 03:21:31 -07:00
aszlig
f9831a94c9
apache-httpd: Simplify all versionOlder calls.
...
We now just have a simple attribute called "version24" which replaces all those
pesky versionOlder that were spreading throughout the file and makes things way
more readable.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 17:47:30 +02:00
aszlig
919e6e55a9
apache-httpd: Create runtime dir for version 2.4.
...
By default the path is determined related to ServerRoot. Unfortunately
ServerRoot is pointing to the Nix store and the web server can't write to it.
We now create a directory called "runtime" withen the stateDir and point
DefaultRuntimeDir to it.
For more information on the DefaultRuntimeDir directive, please see:
http://httpd.apache.org/docs/2.4/mod/core.html#defaultruntimedir
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 17:38:43 +02:00
aszlig
5655ec0efa
apache-httpd: Avoid NameVirtualHost in >= v2.4.
...
NameVirtualHost no longer has any effect on version 2.4 and just emits ugly
warnings, so let's not use it if we use 2.4.
More information: http://httpd.apache.org/docs/2.4/upgrading.html#misc
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 17:03:50 +02:00
aszlig
a88453fbaa
apache-httpd: Properly wrap access directives.
...
The Order/Deny directives are deprecated in version 2.4, so we're going to
define two wrappers for allDenied and allGranted in order to properly generate
configurations for both version 2.2 and 2.4.
For more information an access control changes, see:
http://httpd.apache.org/docs/2.4/upgrading.html#access
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 16:57:18 +02:00
aszlig
3acd98b040
apache-httpd: Add unixd for 2.4, needed by "User".
...
Beginning with 2.4 mod_unixd is needed to supply Unix usernames and groups for
the web server. For details please have a look at:
http://httpd.apache.org/docs/2.4/upgrading.html#commonproblems
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 15:34:08 +02:00
aszlig
3ad8fac5a2
apache-httpd: Dynamically load MPM module in v2.4.
...
Now, MPMs can be loaded at runtime and it's no longer required to compile in one
of the MPM modules statically. So, if version is >= 2.4, load the MPM module
corresponding to the multiProcessingModule value of the service module.
For details, please see: http://httpd.apache.org/docs/2.4/mpm.html
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 15:17:48 +02:00
aszlig
18076e001a
apache-httpd: Use authn_core for version >= 2.3.
...
Beginning with version 2.3, the authn were refactored. As a result, authn_alias
is now part of the new module authn_core, so let's use authn_core instead of
authn_alias.
For details please see: http://httpd.apache.org/docs/2.4/upgrading.html#misc
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 15:11:53 +02:00
Peter Simons
56f90da276
modules/programs/bash: '/run/current-system/sw' is already a part of $NIX_PROFILES
2012-10-16 19:08:10 +02:00
Peter Simons
6a9b855412
modules/programs/bash: '/run/current-system/sw' is already a part of $NIX_PROFILES
2012-10-16 19:07:19 +02:00
Peter Simons
04a8642b4b
modules/programs/bash: clean-up variables used in initialization of bash-completion
2012-10-16 18:41:45 +02:00