Eelco Dolstra
e1984f029d
autovt@.service really has to be a symlink
2014-03-13 00:19:10 +01:00
Domen Kožar
df242d0d79
Merge pull request #1926 from tomberek/kippo_uid_fix
...
UID/GID fix for kippo
2014-03-12 23:34:39 +01:00
Rickard Nilsson
91e6d7411e
winstone NixOS module: Make it possible to set systemd service name
2014-03-12 23:28:38 +01:00
Rickard Nilsson
f24940330b
New NixOS module: services.winstone, for running instances of the Winstone Java Servlet container
2014-03-12 23:14:09 +01:00
Eelco Dolstra
b13a5d4cca
Fix kmscon evaluation
2014-03-12 21:00:59 +01:00
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
Thomas Bereknyei
a2353866a8
UID/GID fix for kippo
2014-03-12 03:32:56 -04: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
Austin Seipp
881bb235d9
nixos: tarsnap module documentation updates
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-08 08:00:56 -06: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
Ricardo M. Correia
02e2431661
zfs: Don't look for devices only in /dev
...
If we don't give out a directory to 'zpool import', it will use libblkid
to automatically find all existing ZFS devices.
2014-03-04 12:58:11 +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
dc700e0925
etc: uid/gid support for copied files
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-02-23 18:00:47 -06: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
Ricardo M. Correia
a146fdab80
nixos-generate-config: Don't generate filesystem options
...
We don't want to hardcode configuration options that the current kernel chose
for us when mounting the filesystem, since the defaults can change in the
future.
2014-02-19 17:18:50 +01:00
Ricardo M. Correia
cea9a1a242
nixos-generate-config: Don't generate /var/lib/nfs/rpc_pipefs filesystem
...
It's automatically mounted if the system has support for NFS.
2014-02-19 17:18:49 +01:00
Domen Kožar
ad0732313d
gnome3: typo
2014-02-19 16:53:08 +01:00
Domen Kožar
746c42d10f
gnome3: add some default core packages to be installed
2014-02-19 16:38:42 +01:00
Domen Kožar
189273af38
add gnome3.vino
2014-02-19 16:38:41 +01:00
Pascal Wittmann
ff7e234fb4
Removed obsolete option services.xserver.videoDriver
2014-02-18 23:13:00 +01:00
Pascal Wittmann
516cdc25a4
Renamed obsolete option services.xserver.videoDrivers to hardware.opengl.videoDrivers
2014-02-18 23:11:49 +01:00
Eelco Dolstra
d2aa2ac494
memtest.nix: Use toString
2014-02-18 19:13:07 +01:00
Moritz Ulrich
958df8b9d1
i18n.consoleKeyMap: Accept string or path.
...
i18n.consoleKeyMap maps to KEYMAP=... in vconsole.conf and `loadkeymap'
in stage1. Both of these accept paths to a keymap file in addition to
a string containing the name of the keymap.
With this commit, it's possible to use your own keymap via:
i18n.consoleKeyMap = ./path/to/something.kmap
2014-02-17 20:46:33 +01:00
Domen Kožar
4b201b27bf
gnome3: correctly place GIO_EXTRA_MODULES
2014-02-17 00:24:13 +01:00
Domen Kožar
e24b01f615
desktop-manager.gnome3: add dconf support
2014-02-16 21:37:18 +01:00
Domen Kožar
0b5d523b84
redshift: default to string type for option brightness
2014-02-16 14:22:49 +01:00
Shea Levy
abf901484c
Allow directly setting hashedPassword for root
2014-02-16 07:33:07 -05:00
Petr Rockai
01d7e79eaf
nixos: Make serial agetty's bitrates configurable.
2014-02-15 12:57:27 +01:00
Petr Rockai
42ce480a52
nixos: Try harder to get LVM-hosted filesystems up in stage1.
2014-02-15 12:57:17 +01:00
Domen Kožar
77750efc7e
Merge pull request #1739 from ttonelli/master
...
Improvements to RedShift service
2014-02-15 10:33:45 +01:00
Thiago Tonelli Bartolomei
2dcf933817
adding wantedBy graphical.target
2014-02-14 09:48:19 -05:00
Shea Levy
48b8118f2c
virtualbox-image.nix: initialRootPassword setting should be easily overrideable
2014-02-14 09:06:26 -05:00
Oliver Charles
2ea7c90839
postgresql module: Use the default superuser username
...
PostgreSQL defaults to having 'postgres' as the superuser. NixOS should
use this default name to provide a less surprising result to people who
enable services.postgres.
2014-02-13 18:52:59 +00:00
Shea Levy
c8f1a6ac1e
Revert "Add nixosSubmodule option type"
...
Moving recent types work to a separate branch for now
This reverts commit ca1c5cfa8f
.
2014-02-13 12:10:50 -05:00
Shea Levy
220654e205
Revert "Add heterogeneousAttrsOf option type"
...
Moving recent types work to a separate branch for now
This reverts commit 3f70dabad3
.
2014-02-13 12:10:50 -05:00
Rickard Nilsson
fc90a739ba
networkmanager module: No need to start ModemManager explicitly, done by NM
2014-02-13 18:05:04 +01:00
Thiago Tonelli Bartolomei
b5d17fe873
- adding brightness options
...
- setting options to be uniq
- using proper systemd exec service
2014-02-13 11:11:14 -05:00
Domen Kožar
85d38d1436
nginx: add appendConfig option with types.lines
2014-02-12 19:13:36 +01:00
Domen Kožar
a49fbca134
Merge pull request #1730 from pSub/logcheck-uid
...
nixos: add uid for logcheck and only create a user for the default user
2014-02-12 16:10:35 +01:00
Oliver Charles
625b42838a
NetworkManager: Fix aliases and dependencies
...
There are two fixes in this commit.
Firstly, I am creating proper symlinks for the Alias= definitions in the
.service files. This achieves the same result as `systemctl enable`, and
I think is preferred over `mv`.
Secondly, `networkmanager-init` now wants `NetworkManager.service`,
along with `ModemManager.service`. ModemManager does not depend on
NetworkManager (according to `systemctl list-dependencies ModemManager`),
thus NetworkManager never got started on boot.
2014-02-12 11:32:49 +00:00
Shea Levy
3f70dabad3
Add heterogeneousAttrsOf option type
...
It is parameterized by a function that takes a name and evaluates to the
option type for the attribute of that name. Together with
submoduleWithExtraArgs, this subsumes nixosSubmodule.
2014-02-11 14:59:24 -05:00
Shea Levy
ca1c5cfa8f
Add nixosSubmodule option type
...
Since NixOS modules expect special arguments, use a hack to provide them
2014-02-11 14:21:34 -05:00
Eelco Dolstra
9c616e3bf4
Remove /etc/ca-bundle.crt
...
Applications should use /etc/ssl/certs/ca-bundle.crt instead.
2014-02-11 17:13:36 +01:00
Pascal Wittmann
884190a238
nixos: add uid for logcheck and only create a user for the default user
2014-02-11 14:19:06 +01:00
Shea Levy
4ab5646417
Add a keys group with read access to /run/keys
...
This allows processes running as unprivileged users access to keys they might need
2014-02-11 07:00:10 -05:00
Michael Raskin
91b5aa7e10
Add some packages needed by some generic HP PCL drivers
2014-02-11 01:34:19 +04:00
Michael Raskin
4c9c7f6ba4
Add an option to change vsftpd anonymos write umask.
2014-02-11 01:34:19 +04:00
Shea Levy
80cc2697b1
user-groups: Sidestep all password escaping issues
...
Now passwords are written to a file first
2014-02-10 10:12:34 -05:00
Thomas Tuegel
3dc6168b31
Properly escape passwords sent to chpasswd
...
The mutableUsers feature uses `chpasswd` to set users passwords.
Passwords and their hashes were being piped into the program using
double quotes ("") to escape. This causes any `$` characters to be
expanded as shell variables. This is a serious problem because all the
password hash methods besides DES use multiple `$` in the hashes. Single
quotes ('') should be used instead to prevent shell variable expansion.
2014-02-10 08:16:22 -06:00
Shea Levy
6a8cc9ab11
mediawiki: Fix some references to /bin/bash
2014-02-10 09:14:30 -05:00
Shea Levy
42df6fcee9
mediawiki: Run update script after initializing the database
2014-02-10 08:56:16 -05:00
Tomasz Kontusz
fe38031168
Upgrade bumblebee and add nixos module
...
* Bump bumblebee to 3.2.1
* Remove config.patch - options it added can be passed to ./configure now
* Remove the provided xorg.conf
Provided xorg.conf was causing problems for some users,
and Bumblebee provides its own default configuration anyway.
* Make secondary X11 log to /var/log/X.bumblebee.log
* Add a module for bumblebee
2014-02-09 15:09:41 +01:00
Bjørn Forsman
48851fa749
nixos/memtest: use docbook formatting
...
Without this the HTML manual and manpage is quite unreadable (newlines
are squashed so it doesn't look like a list anymore).
(Unfortunately, this makes the source unreadable.)
2014-02-09 13:56:09 +01:00
Ricardo M. Correia
cba2444d11
nixos/memtest: Allow user to specify memtest86 boot parameters
2014-02-09 13:55:37 +01:00
Domen Kožar
ee14f8da9a
remove references to isSystemUser and fix eval of tested job
2014-02-08 21:10:00 +01:00