Eelco Dolstra
c2da812bd0
Enable upower's systemd unit
2012-08-21 11:29:59 -04:00
Eelco Dolstra
08f14b33c1
Merge branch 'master' of github.com:NixOS/nixos into systemd
2012-08-20 11:27:38 -04:00
Eelco Dolstra
39ec043aea
Typo
2012-08-20 11:21:03 -04:00
Eelco Dolstra
cdc3604a7d
kdm: Do a poweroff, not a halt
2012-08-20 11:11:10 -04:00
Eelco Dolstra
ebb1781dfc
Fix KDE/kdm
2012-08-20 11:10:19 -04:00
Eelco Dolstra
1e5a2bca28
Remove HAL
...
It's obsolete and we no longer use it.
2012-08-17 14:45:43 -04:00
Eelco Dolstra
c60d6caee8
Rename xserver.service to display-manager.service
...
The latter is what graphical.target expects.
2012-08-17 14:43:41 -04:00
Eelco Dolstra
490ce3a230
PAM: Rename ownDevices to startSession
...
Logind sessions are more generally useful than for device ownership.
For instances, ssh logins can be put in their own session (and thus
their own cgroup).
2012-08-17 13:48:22 -04:00
Eelco Dolstra
676157f1e7
slim.nix: Remove the hideCursor option because it doesn't work
2012-08-17 13:42:52 -04:00
Eelco Dolstra
b91aa1599c
sshd.nix: Disable password logins for root by default
2012-08-17 13:32:23 -04:00
Eelco Dolstra
a44e575196
switch-to-configuration: Respect the ‘restartIfChanged’ attribute
2012-08-17 13:14:42 -04:00
Eelco Dolstra
7d958dcdd1
Drop Upstart references
2012-08-17 11:02:12 -04:00
Eelco Dolstra
f903a3dcc8
dhcpcd.nix: Add a reload action for rebinding interfaces
2012-08-17 11:01:07 -04:00
Eelco Dolstra
2ce5abaedf
acpid.nix: Fix dependencies
2012-08-17 11:00:33 -04:00
Eelco Dolstra
8e8bad96d4
alsa.nix: Add job description
2012-08-17 11:00:14 -04:00
Eelco Dolstra
0e3f03106f
postgresql.nix: Add an option for overriding the PostgreSQL package
2012-08-15 17:02:03 -04:00
Eelco Dolstra
d18c2afc6f
Add an ip-up target for services that require IP connectivity
2012-08-15 15:38:52 -04:00
Eelco Dolstra
c2b2a3369a
Fix dependencies of Apache and PostgreSQL
2012-08-14 18:15:37 -04:00
Eelco Dolstra
4475294f57
Fix a hang during shutdown
...
Subtle: dhcpcd.service would call resolvconf during shutdown, which in
turn would start invalidate-nscd.service, causing the shutdown to be
cancelled. Instead, give nscd.service a proper reload action, and do
"systemctl reload --no-block nscd.service". The --no-block is
necessary to prevent that command from waiting until a timeout occurs
(bug in systemd?).
2012-08-14 16:45:50 -04:00
Shea Levy
85997a6692
mingetty: Don't make restartIfChanged optional
2012-08-12 11:44:00 -04:00
aszlig
d809a9e6b2
mingetty: Option to not restart on service change.
...
This especially annoyed me whenver I was doing nixos-rebuild switch and getting
logged out on all consoles. With this there now is services.mingetty.dontRestart
for heavy VT users to deactivate this behaviour.
2012-08-12 13:50:50 +02:00
Eelco Dolstra
21da462ad5
Merge pull request #25 from shlevy/required-kernel-config
...
Required kernel config
2012-08-08 10:33:41 -07:00
Shea Levy
64d0069be3
udev requires unix sockets and inotify
2012-08-06 17:02:35 -04:00
Eelco Dolstra
23947c26a8
Revert accidental commit
2012-08-06 15:53:04 -04:00
Eelco Dolstra
b11c5d5991
nscd: Ensure that invalidate-nscd starts after nscd
2012-08-06 12:26:52 -04:00
Eelco Dolstra
9f9ae7c7e9
Share option definitions between the systemd and Upstart compatibility modules
2012-08-06 11:45:59 -04:00
Peter Simons
d13a3c741a
spamassassin: call daemon with complete path
2012-08-03 18:07:06 +02:00
Eelco Dolstra
d5d8acfacd
Assign uid/gid 54 to wwwrun
2012-08-03 11:05:25 -04:00
Eelco Dolstra
0a0c28f812
Revert "Add services.httpd.fixUidAndGid option to assign reliable numeric UID and GID for the Apache user."
...
This reverts commit 0ef085d58a
.
2012-08-03 10:52:53 -04:00
Peter Simons
0ef085d58a
Add services.httpd.fixUidAndGid option to assign reliable numeric UID and GID for the Apache user.
...
The option is disabled by default so that previously existing installations
aren't affected.
If you'd like to migrate to the fixed numeric id for Apache, set "fixUidAndGid
= true", edit the file "/etc/groups" and replace the old GID value with 54.
(NixOS can't do that for you because it refuses to change a GID that identifies
the primary group of a user.) Then run
find / -xdev -uid $oldUID -exec chown 54 {} +
find / -xdev -gid $oldGID -exec chgrp 54 {} +
to update ownership of all files that are supposed to be owned by Apache.
2012-08-03 16:39:55 +02:00
Eelco Dolstra
29f721ba54
Only create the Apache user/group if it's "wwwrun"
2012-08-03 09:35:06 -04:00
Peter Simons
1b249eaf05
Initial version of a SpamAssassin service.
...
The configuration is expected to be managed by the user in /etc/spamassassin.
2012-08-03 15:11:28 +02:00
Eelco Dolstra
d4fec178fd
Merge remote-tracking branch 'origin/master' into systemd
2012-08-02 13:44:16 -04:00
Eelco Dolstra
1fcef0a0e0
Don't use nixUnstable
2012-08-02 13:31:57 -04:00
Mathijs Kwik
52fd5ea6ca
gogoclient: setup config and dirs on service start, not on system activation
2012-07-31 20:07:05 +02:00
Eelco Dolstra
2678ff3726
Use /sys/fs/cgroup instead of /dev/cgroup
2012-07-30 13:49:18 -04:00
Eelco Dolstra
a559a2a606
mediawiki.nix: Use the right PHP build
2012-07-30 17:19:23 +02:00
Peter Simons
e988324534
Use a dedicated user ('named') for BIND instead of running the daemon as super user.
2012-07-27 00:08:41 +02:00
Phreedom
cb063afcbf
F-Prot virus signaure database updater: package
2012-07-24 10:52:04 +03:00
Peter Simons
e8e19bbb1f
modules/services/web-servers/apache-httpd: rename 'apacheHttpd' option to 'package'
2012-07-24 01:01:48 +02:00
Peter Simons
b3627f6c69
modules/services/web-servers/apache-httpd: add apache user to the apache group
2012-07-23 22:00:35 +02:00
Peter Simons
52c97adaba
modules/services/web-servers/apache-httpd: make this module more configurable
...
- The new option 'apacheHttpd' determines the version of the Apache
HTTP Server that's being used by this module. The default version
is Apache 2.2.x, as before.
- The new option 'configFile' allows users specify their own custom
config file for the web server instead of being limited to the one
that this module generates.
2012-07-23 21:48:21 +02:00
Phreedom
4f109c8a3d
ClamAV: package virus fingerprint database updater.
2012-07-23 17:19:59 +03:00
Marc Weber
7ddea025e4
dont hardcode apache group name when setting permissions for state dir
2012-07-23 03:28:21 +02:00
Eelco Dolstra
7a98c884f8
dhcpcd.nix: Go into the background and restart ntpd
2012-07-20 18:24:55 -04:00
Eelco Dolstra
ee075bdf6b
agetty.nix: Add remark
2012-07-20 17:39:05 -04:00
Eelco Dolstra
77510eaa99
dbus.nix: Fix path to dbus-send
2012-07-20 17:38:36 -04:00
Eelco Dolstra
1602f8e162
Typo
2012-07-20 14:58:15 -04:00
Eelco Dolstra
41cb04f793
Implement serial-getty@.service
2012-07-20 11:36:09 -04:00
Eelco Dolstra
ae62436697
Random changes
2012-07-19 17:33:22 -04:00
Eelco Dolstra
425ec4cb00
syslogd: Make it work with systemd
...
Also made syslogd optional (and disabled by default).
2012-07-19 12:48:30 -04:00
Eelco Dolstra
44d091674b
Merge branch 'master' of github.com:NixOS/nixos into systemd
...
Conflicts:
modules/config/networking.nix
modules/services/networking/ssh/sshd.nix
modules/services/ttys/agetty.nix
modules/system/boot/stage-2-init.sh
modules/system/upstart-events/shutdown.nix
2012-07-16 17:27:11 -04:00
Eelco Dolstra
1d57489427
Global replace /var/run/opengl-driver -> /run/opengl-driver
2012-07-16 11:34:21 -04:00
Eelco Dolstra
98459eb675
Global replace /var/run/booted-system -> /run/booted-system
2012-07-16 11:34:21 -04:00
Eelco Dolstra
73532c3855
Global replace /var/run/current-system -> /run/current-system
2012-07-16 11:34:21 -04:00
Shea Levy
8c24de13e4
D'oh
2012-07-16 08:11:44 -04:00
Shea Levy
cdd8ecf9c7
multitouch: Invert left-right scrolling when invertScroll is enabled
2012-07-16 08:03:47 -04:00
Shea Levy
3d2b83c110
multitouch: Add an option to ignore palm touches
2012-07-14 21:40:49 -04:00
Shea Levy
c909ea9208
multitouch: Add option to invert scroll
2012-07-14 18:02:46 -04:00
Eelco Dolstra
57d74e6f4f
openssh.authorizedKeys.keyFiles: allow multiple keys
...
Ugly hack to get around the error "a string that refers to a store
path cannot be appended to a path". The underlying problem is that
you cannot do
"${./file1} ${./file2}"
but you can do
" ${./file1} ${./file2}"
Obviously we should allow the first case as well.
2012-07-13 17:59:03 -04:00
Eelco Dolstra
7e77dae458
sshd.nix: Create ~/.ssh/authorized_keys with the right ownership
2012-07-13 11:48:47 -04:00
Shea Levy
8544ba285d
logstash: Fix sloppy description fields
2012-07-12 14:35:06 -04:00
Shea Levy
a2b59f595f
logstash: Export config.lib.logstash.mk{Float,Hash,NameValuePairs}.
...
This allows hiding the implementation details for how to represent logstash
config types that don't directly map to nix expressions, particularly floats,
hashes, and name-value pair sets with repeated names. Instead of setting
__type and value directly, the user now uses these convenience functions to
generate their logstash config.
2012-07-12 14:15:43 -04:00
Peter Simons
0c12e29368
Don't add the i3 window manager to the system if it isn't enabled in configuration.nix.
2012-07-12 11:33:10 +02:00
Shea Levy
5412b1089f
logstash: Start process in /tmp
...
See https://logstash.jira.com/browse/LOGSTASH-107
2012-07-11 13:45:36 -04:00
Shea Levy
315087def1
logstash: use {name=; value='} attrsets for repeated name-value pairs instead of parallel lists
2012-07-11 11:59:00 -04:00
Shea Levy
3039caf5ad
Add logstash module.
...
Since the logstash config file seemed very similar to a nixexpr, I decided
to map directly from nixexprs to logstash configs. I didn't realize until
too far in that this solution was probably way over-engineered, but it
works.
2012-07-11 11:22:16 -04:00
Rok Garbas
b7398794ed
i3 window manager was not installed when enabled
2012-07-10 16:07:53 +02:00
Eelco Dolstra
fbf9ecf78a
Apache: make /var/run/httpd readable to wwwrun, as required by mod_cgid
2012-07-09 16:27:39 +02:00
Eelco Dolstra
d0c9a3ce32
Apache: build PHP against the right httpd
...
If httpd is built with a threaded MPM, then PHP needs to be built with
thread support as well.
2012-07-06 23:28:46 +02:00
Eelco Dolstra
18031e41bb
Apache: Add an option to set the MPM
...
Supported values are "prefork" (default), "worker" and "event"
(experimental in Apache 2.2 but not 2.4).
2012-07-06 14:23:55 -04:00
Eelco Dolstra
a07eb262a0
Apache: don't fork into the background due to Upstart weirdness
...
If Apache crashes during startup, Upstart for some reason shows the
job in the "start/running" state. As a workaround, don't fork.
2012-07-06 13:47:42 -04:00
Eelco Dolstra
46dce21bff
MediaWiki: Generalise the skins support
...
The new option ‘skins’ allows specifying a list of directories
providing skins to be added to the MediaWiki installation. The
‘defaultSkin’ option just sets the default.
2012-07-05 21:04:23 +02:00
Peter Simons
f22dbd5e05
modules/services/networking/wpa_supplicant.nix: strip trailing whitespace
2012-06-29 11:53:16 +02:00
Peter Simons
61b8ee9029
modules/services/networking/wpa_supplicant.nix: document that interface auto-detection doesn't work on Linux 3.4.x
2012-06-29 11:53:16 +02:00
Eelco Dolstra
bf15293b1e
Merge branch 'master' of github.com:NixOS/nixos into systemd
...
Conflicts:
modules/services/hardware/udev.nix
2012-06-28 14:19:38 -04:00
David Guibert
dbe2325603
fix the grep pattern finding programs called by absolute paths in udev rules.
2012-06-27 20:41:07 +02:00
Eelco Dolstra
872a76b177
Merge branch 'master' of github.com:NixOS/nixos into systemd
2012-06-22 11:11:21 -04:00
Eelco Dolstra
055eae2a58
Merge pull request #1 from aszlig/i3_integration
...
Add xserver integration of i3 WM.
2012-06-20 20:49:45 -07:00
Eelco Dolstra
2526afb1c7
Don't use ConsoleKit
2012-06-19 16:22:26 -04:00
Eelco Dolstra
dab6bbe3a6
Set the default unit to "graphical.target" if X11 is enabled
2012-06-19 14:51:04 -04:00
Eelco Dolstra
2b305d7f29
Remove accidentally committed line
2012-06-19 14:50:23 -04:00
Eelco Dolstra
f213c4ca29
Don't run syslogd and klogd
...
The systemd journal removes the need for running syslogd and klogd, so
don't start them.
2012-06-19 09:28:04 -04:00
Eelco Dolstra
88f94d76bc
Use socket-based activation of the Nix daemon
2012-06-18 23:31:07 -04:00
Eelco Dolstra
ca2bd17f54
Whitespace
2012-06-18 17:58:31 -04:00
Eelco Dolstra
9f5051b76c
Rename mingetty module to agetty
2012-06-18 17:55:27 -04:00
Eelco Dolstra
352510c208
Add an option ‘boot.systemd.services’
...
This option makes it more convenient to define services because it
automates stuff like setting $PATH, having a pre-start script, and so on.
2012-06-18 15:28:31 -04:00
Eelco Dolstra
42ee3b4209
Add a ‘wantedBy’ attribute to unit definitions
...
This attribute allows a unit to make itself a dependency of another unit.
Also, add an option to set the default target unit.
2012-06-17 23:31:21 -04:00
Mathijs Kwik
bd5b06bf86
synaptics driver: accelleration factor config option
...
svn path=/nixos/trunk/; revision=34523
2012-06-16 11:13:48 +00:00
Eelco Dolstra
4a95f8996b
To ease migration to systemd, generate units from the ‘jobs’ option
...
Also get rid of the ‘buildHook’ job option because it wasn't very useful.
2012-06-16 00:19:43 -04:00
Eelco Dolstra
164d6e6ab2
Use udev from systemd
2012-06-15 13:09:22 -04:00
Eelco Dolstra
a46894b960
Get lots more systemd stuff working
...
Enabled a bunch of units that ship with systemd. Also added an option
‘boot.systemd.units’ that can be used to define additional units
(e.g. ‘sshd.service’).
2012-06-14 18:44:56 -04:00
Lluís Batlle i Rossell
3d2ed19067
Making fcron use the daemonType=fork, instead of foreground. This way logrotate
...
does not have to handle it appart.
svn path=/nixos/trunk/; revision=34422
2012-06-10 15:14:16 +00:00
Lluís Batlle i Rossell
6824f1e082
Making the dovecot2 mail location a nixos option.
...
svn path=/nixos/trunk/; revision=34421
2012-06-10 15:07:25 +00:00
Lluís Batlle i Rossell
9b833aafb9
Fix prayer so it does not start a server at port 80.
...
svn path=/nixos/trunk/; revision=34420
2012-06-10 14:51:43 +00:00
Lluís Batlle i Rossell
78333e5d84
Add a 'named' option to run only for ipv4.
...
I remember the 'named' log was giving annoying messages on systems not ipv6
capable (I can't recall if lacking the kernel ipv6 code or unconfigured ipv6
addresses).
svn path=/nixos/trunk/; revision=34419
2012-06-10 14:50:44 +00:00
Lluís Batlle i Rossell
c539224a84
Postfix was started before all filesystems were mounted. I add 'filesystem' to startOn.
...
svn path=/nixos/trunk/; revision=34416
2012-06-10 14:36:16 +00:00
Eelco Dolstra
87e06b97a3
* Don't include the hostname in option default values. Default values
...
are included in the manual, so this causes a different manual to be
built for each machine.
* Clean up indentation of cntlm module.
svn path=/nixos/trunk/; revision=34387
2012-06-08 14:29:31 +00:00
Eelco Dolstra
6aa4120f3a
* Shorten the greeting line to make it fit on a 80-character terminal
...
again by removing the kernel version.
svn path=/nixos/trunk/; revision=34376
2012-06-06 23:14:57 +00:00
aszlig
b78ce79f89
Add xserver integration of i3 WM.
...
This allows to set i3 as the default window manager in the system configuration.
2012-06-04 21:19:12 +02:00