Eelco Dolstra
09c14cd8aa
switch-to-configuration: Don't try to start masked units
2014-03-12 18:52:11 +01:00
Eelco Dolstra
f198c40608
Don't depend on the text of disabled units
...
This prevents pulling in unnecessary dependencies.
2014-03-12 18:52:11 +01:00
Eelco Dolstra
207c881df9
Don't include superfluous lines in generated units
2014-03-12 18:52:11 +01:00
Eelco Dolstra
d412245601
getty@ and autovt@: Use the upstream units
2014-03-12 18:52:10 +01:00
Eelco Dolstra
691c0cd72e
systemd: Allow customisation of upstream units
...
You can now say:
systemd.services.foo.baseUnit = "${pkgs.foo}/.../foo.service";
This will cause NixOS' generated foo.service file to include
foo.service from the foo package. You can then apply local
customization in the usual way:
systemd.services.foo.serviceConfig.MemoryLimit = "512M";
Note however that overriding options in the original unit may not
work. For instance, you cannot override ExecStart.
It's also possible to customize instances of template units:
systemd.services."getty@tty4" =
{ baseUnit = "/etc/systemd/system/getty@.service";
serviceConfig.MemoryLimit = "512M";
};
This replaces the unit options linkTarget (which didn't allow
customisation) and extraConfig (which did allow customisation, but in
a non-standard way).
2014-03-12 18:52:10 +01:00
Eelco Dolstra
3358906395
apcupsd: Description -> description
2014-03-12 18:52:10 +01:00
Rickard Nilsson
4e23573138
phpfpm module: Make extraConfig and poolConfigs mergeable by switching option type to types.lines
2014-03-12 11:45:31 +01:00
Rickard Nilsson
562a8ca4a2
Add phpfpm NixOS service module
2014-03-12 11:38:50 +01:00
Domen Kozar
28069d6aad
move windowManager.xbmc to desktopManager.xbmc
2014-03-12 09:20:59 +01:00
Mathijs Kwik
42d7923752
Merge pull request #1911 from offlinehacker/nixos/couchdb/fix
...
nixos/couchdb: fix stopping of service, by making it non-forking, a few other improvments
2014-03-11 09:35:27 +01:00
Jaka Hudoklin
2297f31339
nixos/network-interfaces: do not try to enable or disable ipv6 in container
2014-03-10 12:39:22 +01:00
Jaka Hudoklin
993ef8287e
nixos/couchdb: fix stopping of service, by making it non-forking, a few other improvments
...
Conflicts:
nixos/modules/services/databases/couchdb.nix
2014-03-10 11:08:05 +01:00
Domen Kozar
f0b34fe8ff
searx: refactor a bit
2014-03-09 18:57:17 +01:00
Matej Cotman
7e932ca4e2
searx: add module
2014-03-09 17:33:56 +01:00
Domen Kožar
bb7fe59b80
Merge pull request #1767 from the-kenny/fix-consoleKeyMap-type
...
i18n.consoleKeyMap: Accept string or path.
2014-03-08 18:04:55 +01:00
Ellis Whitehead
9af5d4731d
typo: occured -> occurred
2014-03-07 19:39:55 +01:00
Domen Kozar
10787951ab
tarsnap: mention getting started page
2014-03-07 15:37:09 +01:00
Austin Seipp
24cf6afa05
nixos: add Tarsnap backup service module
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-07 15:37:09 +01:00
Domen Kožar
068c0aa219
Merge pull request #1833 from coreyoconnor/fix-synaptics-config
...
correct tapButtons in synaptics config.
2014-03-07 13:10:31 +01:00
Shea Levy
4b28d9d934
Merge branch 'desktopmanager-fix' of git://github.com/pSub/nixpkgs
...
Use feh only as a fallback if the xserver is actually enabled.
2014-03-07 04:39:25 -05:00
Gergely Risko
322b7124a8
Allow ntpq locally
2014-03-06 11:54:02 +01:00
Eelco Dolstra
6572708d39
Always load the "configs" kernel module
...
We used to have the configuration of the kernel available in a
somewhat convenient place (/run/booted-system/kernel-modules/config)
but that has disappeared. So instead just make /proc/configs.gz
available. It only eats a few kilobytes.
2014-03-05 15:22:32 +01:00
Pascal Wittmann
c2fcf07f06
Use feh only as a fallback if the xserver is actually enabled.
...
Otherwise feh is installed even though no xserver is available.
2014-03-04 09:10:23 +01:00
Eelco Dolstra
6a9168ad06
Get rid of services.mesa.* message
2014-03-03 13:57:08 +01:00
Vladimír Čunát
d9cc648d6c
Merge pull request #1791 from wizeman/u/nixos-gen
...
nixos-generate-config: improve filesystem generation
2014-03-02 11:27:43 +01:00
Domen Kožar
b792394119
nixos-manual: show manual on tty8 by default
2014-02-28 13:32:19 +01:00
Domen Kožar
e9f3199973
add gstreamer 1.0 setup-hook and use it where appropriate
2014-02-28 02:03:07 +01:00
Domen Kožar
ab0aae42a4
couchdb: remove redundant customConfigFile
2014-02-27 14:34:19 +01:00
Domen Kožar
d6a3cada9b
couchdb: stricter types
2014-02-27 14:33:50 +01:00
Domen Kožar
9d55a4c513
couchdb: add ids
2014-02-27 14:33:30 +01:00
Rok Garbas
0bebcd7d1f
folders of pidFile and uriFile should be writable by couchdb user/group
2014-02-27 13:34:11 +01:00
Rok Garbas
55cff93f04
couchdb(nixos): removing whitespace and line that was commented
2014-02-27 13:34:11 +01:00
Rok Garbas
62438c09f7
update couchdb to 1.5.0(current latest) and add service for it
2014-02-27 13:34:11 +01:00
Domen Kožar
97a0dd9eb9
nixos: set all package options to have type package
2014-02-27 13:22:29 +01:00
Shea Levy
f7c04b1e6b
mediawiki: Don't rewrite /images if uploads are enabled
2014-02-27 07:17:10 -05:00
Shea Levy
1e7300ad67
mediawiki rewrite rules only needed with no urlPrefix
2014-02-27 07:17:10 -05:00
Shea Levy
32470621d5
Restart keys.target on reconfiguration
2014-02-26 13:35:04 -05:00
Shea Levy
69b6b939ef
rename.nix: Handle renaming of a whole set of options
...
mkIf was pushed down, making the obsoleted argument unconditionally evaluated
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-26 10:06:28 -05:00
Shea Levy
efb18d9aa5
D'oh
2014-02-26 08:49:21 -05:00
Shea Levy
1ce6fff4e2
Merge mysql55 module into mysql
...
This also removes the default for services.mysql.package, as this should
not generally be updated automatically if we change the mysql attribute
2014-02-26 07:54:12 -05:00
Shea Levy
793328e1ee
Mediawiki: Add some needed rewrites
2014-02-25 09:13:40 -05:00
Shea Levy
0d4a9e3aa6
Allow httpd subservices to set the document root
...
Only the main service OR one of the subservices can set the document
root. This is used by mediawiki when it is hosted at the root of the
vhost.
2014-02-25 07:44:45 -05:00
Corey O'Connor
20567eba1f
correct tapButtons in synaptics config. Dont rely on the X11 input settings to take the last option.
2014-02-24 16:03:47 -08:00
Rickard Nilsson
d5211b0e0e
Make initialRootPassword overrideable in all virtualisation modules, not just virtualbox.
2014-02-24 18:05:26 +01:00
Austin Seipp
fc9022bea1
firewall: add support for TCP/UDP port ranges
...
This is useful for packages like mosh, which use a wide UDP port range
by default for incoming connections.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-02-22 18:19:22 +01:00
Petr Rockai
f21abed131
nixos: Assign uid/gid to dictd's service user.
2014-02-22 12:00:08 +01:00
Shea Levy
95a77ea39f
Unconditionally add ssh to nix-daemon's path for the ssh substitituer
2014-02-20 14:17:30 -05:00
Shea Levy
17f88453f6
Don't complain if HOME isn't writable
2014-02-20 13:40:56 -05:00
Shea Levy
fefc0d9917
Add module to enable the server for the ssh substituter
2014-02-20 13:40:51 -05:00
Shea Levy
2b92e90f91
opensmtpd: Add sendmail to systemPackages
2014-02-20 06:17:15 -05:00