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
e5d4524dda
Test driver: Don't wait for a reply after issuing "poweroff"
2012-10-30 17:01:21 +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
Eelco Dolstra
7a76bcd72a
Fix the installer test
...
http://hydra.nixos.org/build/3253038
2012-10-30 15:00:51 +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
ecd7bc9310
Tests: global search/replace of obsolete functions
2012-10-24 18:22:53 +02:00
Eelco Dolstra
d380152f39
Update some tests for systemd
2012-10-24 18:11:21 +02:00
Eelco Dolstra
b6f9e05269
Update NFS client/server modules for systemd
2012-10-24 18:10:58 +02:00
Eelco Dolstra
c6abc572e8
Run all tests on both 32 and 64 bit
2012-10-24 12:59:19 +02:00
Eelco Dolstra
719aeb36ca
Tests: Depend on ‘network.target’
2012-10-24 12:58: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
Peter Simons
ae1d564c1c
Merge pull request #45 from jcumming/brokendns.121021
...
Add an option for putting options 'single-request' into /etc/resolv.conf
2012-10-23 10:39:30 -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
Jack Cummings
d1bafd9e7f
Merge remote-tracking branch 'upstream/master'
2012-10-19 22:12:25 -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
3d6824feaa
Machine.pm: Don't add .service implicitly
...
Systemd will add .service anyway if no unit type is given.
2012-10-19 10:32:09 -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
da3eaf940b
Merge branch 'apache-httpd-2.4-support'.
...
This adds support for Apache HTTP server version 2.4 through conditionals, where
the changes are:
* Use "Require" instead of Order/Deny/Allow.
* Set DefaultRuntimeDir to a directory within stateDir.
* Create DefaultRuntimeDir within Upstart job.
* Don't add NameVirtualHost directives.
* Use mod_authn_core instead of mod_authn_alias.
* Add mod_unixd to support User/Group directives.
* Load the MPM module specified by multiProcessingModule at runtime.
2012-10-17 22:58:40 +02: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