William A. Kennington III
a269acf480
nixos/dhcpcd: Use null instead of empty list to disable allowInterfaces
2014-08-14 14:05:55 -05:00
William A. Kennington III
320a82dd7f
nixos/dhcpcd: Add an explicit interfaces option
2014-08-14 14:05:55 -05:00
Thomas Strobel
1da35629cc
Cleanup: remove newlines.
2014-08-14 12:42:16 +02:00
Thomas Strobel
b63b8260b5
Add thermald: Linux Thermal Daemon
2014-08-14 02:21:31 +02:00
William A. Kennington III
d0c0c2f9ba
nixos/dhcpd: Wait until network interfaces are configured to start
2014-08-13 15:08:43 -05:00
William A. Kennington III
b3ddcfabd9
nixos/dhcpd: Convert to systemd from upstart
2014-08-13 15:08:43 -05:00
William A. Kennington III
24368beed8
nixos/dhcpd: Use dhcp user instead of nobody
2014-08-13 15:08:43 -05:00
William A. Kennington III
4fbf120e84
nixos/dhcpd: Add the ability to drop privileges
2014-08-13 15:08:08 -05:00
William A. Kennington III
56228e5614
nixos/dhcp: Modernize ddns-update-style
2014-08-13 15:08:08 -05:00
Jascha Geerds
6aa3888d97
trackpoint: Add emulateWheel option
2014-08-13 12:11:20 +02:00
Harald van Dijk
67a5ec4efb
nixos/lighttpd: fix modules for gitweb
...
Setting "services.lighttpd.gitweb.enable" to true doesn't enable the
required lighttpd modules to actually make it work. The problem is that
"or" and "||" don't mean the same thing: "or" falls back to the second
operand if the first is not defined, whereas "||" is the normal logical
operator. When cfg.cgit.enable is defined, as false, the expressions
don't have the desired effect.
[Bjørn: modify commit message]
2014-08-12 21:16:01 +02:00
Vladimír Čunát
02cb604fd6
initrd.availableKernelModules: add support for keyboards
...
As explained in #2169 , some keyboards need special drivers,
so these are always added, both on installation and normal systems.
2014-08-12 20:00:01 +02:00
Vladimír Čunát
87c3c0e885
Merge master into #2129
...
Conflicts (easy, just UID shifted):
nixos/modules/misc/ids.nix
nixos/modules/module-list.nix
2014-08-12 19:24:08 +02:00
Matt Miemiec
8695c58648
Add the bspwm window manager to Nix.
2014-08-12 18:22:15 +02:00
Luca Bruno
14895d6c95
Merge branch 'gdm'
2014-08-12 14:57:38 +02:00
Domen Kožar
cc8e4f6814
provide pulseaudioFull and set it as default to hardware.pulseaudio.package
2014-08-12 12:51:25 +02:00
Luca Bruno
1a29fcae69
gdm: Add very experimental display manager
2014-08-12 11:23:42 +02:00
Rickard Nilsson
66858833e3
mopidy: Add mopidy-scan service for scanning local media
2014-08-12 01:40:44 +02:00
Rickard Nilsson
7b5829c314
Add NixOS module for syslog-ng
2014-08-11 15:06:11 +02:00
Ryan Mulligan
fee04927a4
add note about mutableUsers to user management section
2014-08-10 08:39:31 -07:00
Eelco Dolstra
c7ca46904f
tests/ipv6.nix: Fix race
...
http://hydra.nixos.org/build/13119647
2014-08-10 14:51:23 +02:00
Jaka Hudoklin
675d76b00c
nixos/znc: add option to add module packages to znc
...
Besides that add option for extra znc config and fix a lot of stuff
2014-08-09 19:35:59 +02:00
Eelco Dolstra
4668f37444
Fix NixOS evaluation on i686-linux
2014-08-09 17:19:09 +02:00
Eelco Dolstra
7a09c6018d
Manual: Generate PDF
...
Issue NixOS/nixos#237 .
2014-08-09 16:33:12 +02:00
Eelco Dolstra
aeb5c14eb9
Manual: Remove outdated author stuff
2014-08-09 16:33:01 +02:00
Eelco Dolstra
80a3c883a9
Manual: Render function defaults
2014-08-09 16:33:01 +02:00
Alexei Robyn
0aa2c1dc46
initrd: Fixed to include/use modprobe config files
2014-08-09 22:14:52 +10:00
Vladimír Čunát
52d9c93abe
Merge 'staging' into master
2014-08-08 20:13:23 +02:00
Rickard Nilsson
a01862a4b6
nslcd nixos service: Should be wantedBy multi-user, otherwise not started if activated on running server (only starts on bootup)
2014-08-08 17:40:14 +02:00
Peter Simons
9226fbf56a
Merge remote-tracking branch 'origin/master' into staging.
2014-08-08 09:51:01 +02:00
Joel Taylor
d8cca3d624
fail2ban: systemd support
...
- upgrade fail2ban to 0.9
- override systemd to enable python support and include sqlite3 module
- make fail2ban enablable
2014-08-08 00:10:19 +02:00
System administrator
5355d3d30b
logrotate: use systemd instead of cron
2014-08-07 08:58:50 +02:00
Eelco Dolstra
d5b5d763cd
Fix evaluation
2014-08-06 19:44:13 +02:00
Rob Vermaas
34e6cb5083
Merge pull request #3476 from wkennington/master.unifi
...
Add support for the unifi access point controller
2014-08-06 17:00:54 +02:00
Rob Vermaas
46205faf69
Fix evaluation in virtualbox-image.nix
2014-08-06 16:25:42 +02:00
Eelco Dolstra
2b9ea7fd90
test-instrumentation.nix: Set an empty root password
...
This makes it easier to log in during interactive sessions.
2014-08-06 14:15:23 +02:00
Eelco Dolstra
eab25b104a
test-instrumentation.nix: Improve logging
...
In particular, don't clobber the serial console with duplicate output
from systemd and the journal, and increase the log level.
2014-08-06 14:15:18 +02:00
Eelco Dolstra
0d3b3bd01b
systemd: Use the default log target ("journal-or-kmsg")
...
This ensures that early systemd messages end up in the journal (via
the kmsg buffer).
2014-08-06 14:15:12 +02:00
William A. Kennington III
377454ff0e
nixos/unifi: Explain and simplify the bind mount configuration
2014-08-05 23:15:49 -05:00
William A. Kennington III
12ad29226c
nixos/unifi: Fix ordering of mount rules
2014-08-05 22:09:15 -05:00
William A. Kennington III
dfb596b49b
nixos/unifi: Add service module
2014-08-05 21:40:47 -05:00
William A. Kennington III
beddd36c95
nixos/stage-1: Don't check resilient filesystems
2014-08-05 21:06:51 +02:00
Rickard Nilsson
534a01c2b0
amazon ec2: Make fetch-ec2-data more robust
...
curl does not retry if it is unable to connect to the metadata server.
For some reason, when creating a new AMI with a recent nixpkgs, the
metadata server would not be available when fetch-ec2-data ran. Switching
to wget that can retry even on TCP connection errors solved this problem.
I also made the fetch-ec2-data depend on ip-up.target, to get it to start
a bit later.
2014-08-05 15:12:26 +02:00
Eelco Dolstra
d9e6c07c5b
Remove the containers test from the release-critical builds
...
Too many random failures...
2014-08-05 10:25:42 +02:00
Shea Levy
8a35a474fe
Merge branch 'vbox-configurable-imgsize' of git://github.com/rickynils/nixpkgs
2014-08-04 13:20:13 -04:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Eelco Dolstra
b35770818d
In Nix chroots, provide plain bash, not bash-interactive
...
This way we don't get ncurses in the chroot. Also, use a bind-mount of
/bin/sh to bash, rather than the entire /bin from the host filesystem.
2014-08-04 16:46:39 +02:00
Luca Bruno
769ab3a218
nixos synaptics: allow null value for accelFactor, minSpeed and maxSpeed
...
Some desktop managers like GNOME are able to tweak the speed
of the mouse or synaptics at runtime with good defaults.
2014-08-04 13:42:27 +02:00
Rickard Nilsson
ced7fc37c2
virtualbox-image: Make the image size configurable
2014-08-04 11:29:51 +02:00
Chris Farmiloe
34890e7c2a
nixos: Add enablePHP convinence option to services.httpd module to mimic subservices option
...
Fixes #2699
2014-08-03 21:11:45 +02:00
lethalman
c6f9222a22
Merge pull request #3370 from geerds/trackpoint
...
Fix trackpoint configuration on some systems
2014-08-03 20:45:09 +02:00
aszlig
9d3fbcd054
tomcat: Fix evaluation after e27dcff
.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-03 16:09:45 +02:00
Sander van der Burg
2e44bb9ead
Merge pull request #3425 from luke-clifton/lc-tomcat-jdk
...
Allows the JDK to be chosen in services.tomcat
2014-08-03 14:55:46 +02:00
Vladimír Čunát
6295a3ca36
Merge recent master into x-updates
...
Hydra: ?compare=1142825
Conflicts (easy):
pkgs/applications/audio/lmms/default.nix
pkgs/desktops/e18/enlightenment.nix
pkgs/games/exult/default.nix
pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Shea Levy
fb565f1a4e
amazon-image.nix: Overwrite busybox swapon
2014-08-01 17:55:37 -04:00
Shea Levy
7fec575976
Fix lib functions taken from pkgs.lib instead of lib in nixos
2014-08-01 16:23:56 -04:00
Paul Colomiets
08b214a8f2
First implementation of subuid/subgid manipulation module
2014-08-01 21:27:20 +03:00
Paul Colomiets
fb948c4f28
Upgrade shadow package
2014-08-01 21:19:21 +03:00
Joachim Fasting
decb4266f1
nano: support system-wide nanorc
...
This patch does two things
1. builds nano with sysconfdir=/etc; and
2. adds an option programs.nano.nanorc
2014-08-01 18:19:03 +02:00
Rob Vermaas
3566807e76
Google Compute image:
...
Removed the 'wait for GCE metadata service' job, as it was causing
issues with the metadata service (likely some firewall or something).
In stead, use wget with retries (including connection refused) in
stead or curl for fetching the SSH keys. Also made the stdout/-err
of this job appear in the console.
2014-08-01 15:25:50 +02:00
Luke Clifton
e27dcfff1b
Allows the JDK to be chosen in services.tomcat
2014-08-01 16:52:19 +08:00
Eelco Dolstra
549855113b
modprobe.nix: Use modern environment.etc syntax
2014-07-31 22:09:51 +02:00
Danny Groenewegen
51494f2c33
Restore extraWorkersProperties option for apache httpd tomcat-connector, issue https://github.com/NixOS/nixpkgs/issues/2202
2014-07-31 16:51:51 +02:00
Emery Hemingway
63d259df32
nixos: tmp on tmpfs option
...
/tmp cleaning is done by systemd rather than stage-2-init
enableEmergencyMode moved from systemd to seperate module
new option to mount tmp on tmpfs
new option to enable additional units shipped with systemd
2014-07-30 16:19:26 +02:00
Eelco Dolstra
39a6750362
Shut up a warning in stage 2
2014-07-30 16:07:09 +02:00
Eelco Dolstra
5e96158234
Remove Subversion from the installation CD
2014-07-30 16:04:15 +02:00
Eelco Dolstra
e68b0c7f5f
Mount unionfs-fuse filesystems using the normal fileSystems option
2014-07-30 16:04:15 +02:00
Eelco Dolstra
d45dcf348e
Really fix NixOS/nixos#287
2014-07-30 16:04:15 +02:00
Eelco Dolstra
b599deedb4
makeTest: Pass nodes attribute
...
This allows doing things like:
nix-build nixos/tests/misc.nix -A nodes.machine.config.system.build.initialRamdisk
2014-07-30 14:30:25 +02:00
Eelco Dolstra
f94f659a31
Don't require a device for tmpfs filesystems
2014-07-30 13:18:33 +02:00
Eelco Dolstra
94ce6ec866
Print a sensible error message if no device is specified for a filesystem
2014-07-30 13:18:33 +02:00
Eelco Dolstra
b7c543136a
Move CIFS support into a separate module
2014-07-30 12:39:35 +02:00
Eelco Dolstra
9956b97b2f
Check for systemd environment variables that are too long
...
Issue #3403 . For the case of $PATH being too long, we could call
buildEnv automatically.
2014-07-30 10:28:05 +02:00
Eelco Dolstra
19fc92a8ed
nixos/tests/containers.nix: Don't ping
...
This randomly fails with "Destination Host Unreachable". That
shouldn't happen, since all interfaces/routes should be up after
"nixos-container start" returns. Need more investigation...
2014-07-29 15:34:22 +02:00
Damien Cassou
355a46ec5d
Make the networkmanager group more discoverable
...
This change makes the manual present the networkmanager group at several
places to make sure new users see it.
2014-07-29 09:14:57 +02:00
Jascha Geerds
ead06339b8
Add activationScript for TrackPoint configuration
2014-07-28 23:33:05 +02:00
Eelco Dolstra
cb7b871bd6
initrd: Include filesystem support for /nix, /var etc.
2014-07-28 22:31:18 +02:00
Paul Colomiets
9bc1676e5a
Upgrade docker to 1.1.2 and add docker module
...
This version of module has disabled socketActivation, because until
nixos upgrade systemd to at least 214, systemd does not support
SocketGroup. So socket is created with "root" group when
socketActivation enabled. Should be fixed as soon as systemd upgraded.
Includes changes from #3015 and supersedes #3028
2014-07-28 21:45:49 +02:00
Rickard Nilsson
f5d0d8dbf1
elasticsearch: Fix error in NixOS module, systemd ExecStart path must be absolute.
2014-07-28 20:12:19 +02:00
Rickard Nilsson
212f476c97
Add NixOS module for Mopidy, a music player daemon
2014-07-28 19:52:32 +02:00
Eelco Dolstra
36f99a9a82
Set $SSL_CERT_FILE
...
It's more standard than $OPENSSL_X509_CERT_FILE (which I guess was a
totally unnecessary patch to OpenSSL). Since curl respects
$SSL_CERT_FILE, it's no longer needed to set $CURL_CA_BUNDLE. Git
unfortunately doesn't.
2014-07-28 19:09:32 +02:00
Eelco Dolstra
f64d84698e
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/applications/audio/espeak/edit.nix
pkgs/applications/audio/lmms/default.nix
pkgs/desktops/e18/enlightenment.nix
pkgs/games/exult/default.nix
pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Jaka Hudoklin
cbb6948b4e
Merge pull request #3369 from matejc/fixcpufreqmodule
...
fix e18 cpufreq module: set setuid to freqset
2014-07-26 14:24:23 +02:00
Evgeny Egorochkin
be2cec24ed
RabbitMQ service: add properties essential for clusters
2014-07-26 14:33:53 +03:00
lethalman
de59b6d7cd
Merge pull request #3262 from bjornfor/znc-module-types
...
nixos/znc-service: don't use types.string (it's deprecated)
2014-07-26 12:41:25 +02:00
Jaka Hudoklin
b035be7b44
Merge pull request #3292 from offlinehacker/elasticsearch_plugins
...
elasticsearch: add support for plugins
2014-07-26 02:23:46 +02:00
Bjørn Forsman
0a750e0f39
nixos/munin: change activationScript to preStart script
...
All activation scripts run in serial upon boot and nixos-rebuild switch
etc., in contrast to preStart which run before a service starts, and can
run in parallel with other services.
The munin(-node) activation script is particularly slow. Change it to a
preStart script so that it can run in parallel with other services and
not slow down boot (or nixos-rebuild switch).
This reduces (repeated) "nixos-rebuild test" time from ~16 seconds to ~8
on my (old) laptop.
2014-07-26 00:31:34 +02:00
Jascha Geerds
6fe59796b2
Use a udev rule for trackpoint configuration
2014-07-25 17:40:13 +02:00
Jaka Hudoklin
7eb4d306fb
elasticsearch: add support for plugins
2014-07-25 17:28:59 +02:00
Eelco Dolstra
7c480ad896
setup-etc.pl: Keep track of copied files
...
We now track copied files in /etc/.clean. This is important, because
otherwise files that are removed from environment.etc will not
actually be removed from the file system. In particular, changing
users.extraUsers.<user>.openssh.authorizedKeys.keys to an empty list
would not cause /etc/ssh/authorized_keys.d/<user> to be removed, which
was a security issue.
2014-07-25 14:29:08 +02:00
Eelco Dolstra
72af71d626
nix-ssh: Don't use a shell that refers to a store path
2014-07-25 14:29:08 +02:00
Eelco Dolstra
77dbe2f46e
Add convenience option nix.sshServe.keys
...
This is equivalent to setting
users.extraUsers.nix-cache.openssh.authorizedKeys.keys.
2014-07-25 14:29:08 +02:00
Eelco Dolstra
3e9c2bf4b5
nix-ssh-serve.nix: Remove unnecessary check
...
ForceCommand ensures that we always run nix-store --serve, so there is
no need to check SSH_ORIGINAL_COMMAND.
2014-07-25 14:29:08 +02:00
Jascha Geerds
49e6ef2a19
Fix trackpoint configuration on some systems
2014-07-25 14:01:06 +02:00
Matej Cotman
5b97751a8f
fix e18 cpufreq module: set setuid to freqset
2014-07-25 12:49:31 +02:00
Bjørn Forsman
162cb556f6
nixos/lighttpd: improve sub-service option types (cgit, gitweb)
2014-07-23 22:18:37 +02:00
Bjørn Forsman
35ebc72f1c
nixos/lighttpd-service: don't use types.string (it's deprecated)
2014-07-23 22:12:38 +02:00
aszlig
15bb4c20e6
nixos/doc/manual: Fix typos in README.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-23 15:00:25 +02:00
Rob Vermaas
4cac67cada
Merge pull request #3335 from DamienCassou/doc-for-building-the-nixos-manual
...
README for building the nixos manual
2014-07-23 09:48:09 +02:00
Vladimír Čunát
b9045a7d96
Merge branch 'x-updates' into staging
...
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Vladimír Čunát
644c9eb6f7
Revert "Merge #3054 : add kde 4.13.2"
...
This is due to breaking evaluation; see the PR discussion.
This reverts commit 6a77d5fd3e
, reversing
changes made to 07a09fbe63
.
Conflicts:
nixos/modules/services/x11/desktop-managers/default.nix
2014-07-22 17:48:14 +02:00
Eelco Dolstra
7f410ef923
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
lethalman
27a5a68e41
Merge pull request #3336 from DamienCassou/installing-on-efi
...
Adding a missing instruction for EFI installations
2014-07-22 09:36:26 +02:00
Pascal Wittmann
261ecebfaf
Merge pull request #3323 from wjlroe/logstash-1.4.2
...
Logstash 1.4.2
2014-07-21 20:02:11 +02:00
Damien Cassou
812da7cd2f
Adding a missing instruction for EFI installations
...
This commit also adds a link to rEFInd which is a useful tool to manage
EFI systems. If this link is not desired, I can remove it.
2014-07-21 17:54:38 +02:00
William Roe
8f31b13938
Fix service to use logstash new directory layout
2014-07-21 16:24:18 +01:00
Damien Cassou
c59dc1ddc0
README for building the nixos manual
2014-07-21 17:24:10 +02:00
Vladimír Čunát
9b02635faa
Merge recent master into x-updates
...
Hydra: ?compare=1138350
Conflicts:
nixos/modules/services/x11/desktop-managers/default.nix
Two imports were added independently on the same line.
I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Evgeny Egorochkin
2660e19b73
Google Compute config: add a unit to wait for the metadata server to become available
2014-07-20 14:07:46 +03:00
Matej Cotman
1afb26fb17
e18: enlightenment desktop manager version 18
2014-07-17 23:00:38 +02:00
Eelco Dolstra
1a1442db74
Don't restart systemd-journal-flush
...
It only needs to be started during boot. Starting it at other times
shouldn't hurt, except that if systemd-journald is restarting at the
same time, the latter might not have a SIGUSR1 signal handler
installed yet, so it might be killed by systemd-journal-flush. (At
least that's my theory about the dead systemd-journald instances in
the build farm...)
2014-07-17 21:01:25 +02:00
Vladimír Čunát
16e35532e4
Merge recent master into x-updates
2014-07-17 19:30:56 +02:00
Bjørn Forsman
f9a24ba487
nixos/module-list.nix: keep it sorted
2014-07-16 22:16:34 +02:00
Peter Simons
75bbad8abe
Merge pull request #3285 from ehmry/polipo
...
Polipo
2014-07-16 18:29:11 +02:00
Emery Hemingway
e5988bf4dd
polipo: new service expression
2014-07-16 11:29:40 -04:00
Shea Levy
654c88cc6b
Fix virtualbox image building with new nix
2014-07-15 19:17:06 -04:00
Bjørn Forsman
a4cf5e903b
nixos/redis: fix evaluation
...
Commit 89fee1006c
("nixos/redis: clean up
option types") broke nixos evaluation:
error: attempt to call something which is not a function but a set, at .../nixpkgs/nixos/modules/services/databases/redis.nix:111:28
Fix it.
Reported by Oliver Charles (thanks!).
2014-07-15 17:05:54 +02:00
Bjørn Forsman
89fee1006c
nixos/redis: clean up option types
...
Some options lack a type and some use the deprecated "string" type. Fix
it.
2014-07-15 15:45:52 +02:00
Paul Colomiets
496d12958e
Add automatic plugin activation for vim
2014-07-15 14:59:15 +02:00
Eelco Dolstra
ff97b7dbe6
Merge remote-tracking branch 'origin/master' into staging
2014-07-14 17:04:55 +02:00
taku0
a0c91d66f1
uim, gtk-exe-env, qt-plugin-env: Add input method modules for GTK+ and Qt
2014-07-14 21:33:05 +09:00
Bjørn Forsman
3a4498ab07
nixos/znc-service: don't use types.string (it's deprecated)
...
Apart from s/types.string/types.str/ (or types.lines where appropriate):
* port is changed from string to int.
* extraFlags is changed from types.string (with unfortunate merge
semantics) into a list of strings. A list of strings merge better:
one space is added between elements.
2014-07-13 20:33:15 +02:00
Pascal Wittmann
e57e57c25d
Merge pull request #3245 from rastus-vernon/patch-1
...
Fix repeated typo
2014-07-12 09:36:22 +02:00
Evgeny Egorochkin
64c01fdf81
Google Compute Image: fetch host keys if possible
2014-07-12 08:47:03 +03:00
Evgeny Egorochkin
9d8ddd465d
Google Compute Image needs the interface to be named eth0 for google tools to work properly
2014-07-12 08:47:03 +03:00
Rastus Vernon
d5daa8ae6f
Fix repeated typo
...
"Can either by" should be "Can either be". There are three occurrences of this mistake, all in descriptions of configuration options.
2014-07-11 23:14:53 -04:00
Eelco Dolstra
3b2609deec
Don't restart systemd-remount-fs
...
It's only needed during early boot (in fact, it's probably not needed
at all on NixOS). Restarting it is expensive because it does a sync()
of the root file system.
2014-07-11 23:34:58 +02:00
System administrator
cab929c6c2
httpd: disable logging when logFormat = "none"
2014-07-10 14:32:08 +02:00
Luca Bruno
da9b510996
Move at_spi2_core and at_spi2_atk outside of the gnome3 attrset
2014-07-10 11:39:16 +02:00
Vladimír Čunát
5979d428b4
Merge recent master into x-updates
...
Hydra: ?compare=1134869
Conflicts (just meta):
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00
Eelco Dolstra
973c9abdbe
Fix info command
...
The "info" command has been broken on NixOS since
457fdb3842
(proving that nobody uses
info).
2014-07-08 15:19:08 +02:00
Marc Weber
672adc126e
nixos: add 'firebird' group
...
The firebird module complains without missing 'firebird' group, add it.
2014-07-08 00:00:33 +02:00
Sönke Hahn
09448101c3
mediawiki: add patch for fixing postgresql errors
2014-07-07 23:19:31 +08:00
lethalman
e497265b72
Merge pull request #2963 from Fuuzetsu/locate
...
locate service: allow customisation
2014-07-07 14:24:04 +02:00
Eelco Dolstra
95b828de42
Merge remote-tracking branch 'origin/master' into staging
2014-07-07 13:16:26 +02:00
lethalman
789c9508c2
Merge pull request #2582 from chexxor/feature/add-znc-module
...
Add ZNC module
2014-07-06 11:23:08 +02:00
Igor Pashev
d4a320cd12
Updated Mediawiki to 1.23.1
2014-07-04 17:34:37 +02:00
Alex Berg
7b768ba2f5
Merge remote-tracking branch 'nixos/master' into feature/add-znc-module
...
Conflicts:
nixos/modules/misc/ids.nix
2014-07-03 11:30:11 -05:00
lethalman
cb86818789
Merge pull request #3079 from wmertens/patch-4
...
virtualbox: Fix permissions for /dev/vboxdrvu
2014-07-03 15:05:05 +02:00
Vladimír Čunát
aceb30cd93
Merge master into x-updates
...
Adds the mass-rebuilding python update.
2014-07-02 22:54:41 +02:00
Shea Levy
b3cfb9084b
Get all lib functions from lib, not pkgs.lib, in modules
2014-07-02 12:28:18 -04:00
Luca Bruno
cb41fecaa1
Try fixing the nixos mumble tests, again
2014-07-02 11:28:43 +02:00
Eelco Dolstra
b8cb960a58
Fix evaluation
2014-07-01 16:28:34 +02:00
Eelco Dolstra
06fc1ec34d
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Vladimír Čunát
6a77d5fd3e
Merge #3054 : add kde 4.13.2
2014-06-30 21:26:49 +02:00
Eelco Dolstra
40f7b0f9df
Another attempt to eradicate ensureDir
...
See c556a6ea46
.
2014-06-30 14:56:10 +02:00
Jaka Hudoklin
16f801cba9
nixos/pam: make pam_loginuid optional if in container
2014-06-30 11:08:39 +02:00
Michael Raskin
77314b7eb2
Merge pull request #2888 from nilcons/no-random-arch-downgrades
...
Fix nixos-rebuild.sh to depend on Nix
2014-06-30 12:47:17 +04:00
Michael Raskin
02266194ea
Merge pull request #2894 from kirelagin/fixusergroup
...
Fix conditional handling of users and groups in some services
2014-06-30 10:16:20 +04:00
Michael Raskin
b403893aa2
Merge pull request #2778 from edwtjo/radicale
...
Adding Radicale package and service
2014-06-30 10:11:23 +04:00
Michael Raskin
f2e9ebbd46
Merge pull request #2283 from wizeman/u/sysctl-merge
...
nixos: Fix sysctl option merging
2014-06-30 09:03:33 +04:00
Florian Friesdorf
9b7dbcc83e
name nixos tests, close #3078
2014-06-28 16:05:47 +02:00
Florian Friesdorf
6a3e6164bd
support for nixos test names
2014-06-28 16:05:03 +02:00
aszlig
622673495b
nixos/log2html: Remove schema from jQuery URLs.
...
This allows viewing test logs for example when using a Hydra running
with HTTPS.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-27 09:41:11 +02:00
aszlig
da32f052b1
Revert "nixos/sshd: drop mode from auth keys file".
...
This reverts commit a3331eb87b
.
See https://github.com/NixOS/nixpkgs/issues/2559#issuecomment-47313334
for a description why this is not a good idea.
I guess it's better to implement a sane way to remove all files in
authorized_keys.d, especially because it is also backwards-compatible.
Reopens #2559 .
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-27 09:22:07 +02:00
aszlig
865787ef32
nixos/tests/openssh: Test configured auth keys.
...
So far the test only uses an authorized key that is copied over to the
target machine instead of being set by the target's configuration.
Now, we cover both cases.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-27 08:52:03 +02:00
John Wiegley
8eedf968eb
Merge pull request #3093 from lethalman/sshkeys
...
nixos/sshd: drop mode from auth keys file. Closes #2559
2014-06-26 10:26:47 -07:00
Luca Bruno
a3331eb87b
nixos/sshd: drop mode from auth keys file. Closes #2559
2014-06-26 10:15:34 +02:00
Austin Seipp
13162e8cdb
Fix gitolite docs
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-25 22:55:43 -05:00
Austin Seipp
3eb2d1e03e
nixos: add gitolite module
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-25 22:54:18 -05:00
Alex Berg
9af1e2ab51
Add ZNC module. Has zncConfOptions or specify full conf file.
2014-06-26 05:44:32 +02:00
Jan Malakhovski
37c7d024ef
nixos: change EDITOR and PAGER environment variables to mkDefaults
...
Signed-off-by: Domen Kožar <domen@dev.si>
2014-06-25 17:07:10 +02:00
wmertens
147fd1ff12
virtualbox: Fix permissions for /dev/vboxdrvu
...
See https://bugs.archlinux.org/task/38314 and https://www.virtualbox.org/browser/vbox/trunk/src/VBox/Installer/linux/installer-common.sh?rev=47894#L28
2014-06-25 15:52:05 +02:00
Bjørn Forsman
4def9a762f
nixos: add some missing '.' in option descriptions
2014-06-24 21:25:11 +02:00
Bjørn Forsman
f78ce19d8c
nixos/elasticsearch: capitalize systemd service description
2014-06-24 21:11:12 +02:00
Bjørn Forsman
6ce8f753e0
nixos/elasticsearch: add '.' at end of description strings
...
Nixos option descriptions should be full sentences, ending in a full
stop. (Package descriptions, on the other hand, should not.)
2014-06-24 21:06:30 +02:00
Mateusz Kowalczyk
4934f52bb7
locate service: allow customisation
...
Fixes #2961
2014-06-24 12:54:16 +02:00
lethalman
6d006a9cca
Merge pull request #3005 from offlinehacker/nixos/logstash/enableWeb
...
nixos/logstash: add enableWeb option to enable kibana web interface
2014-06-24 12:42:26 +02:00
Rickard Nilsson
9ff0b303ff
elasticsearch: Add option specifying extra command line options
2014-06-24 11:01:28 +02:00
Rickard Nilsson
94deea2035
nixos: Add option hardware.sane.configDir
2014-06-24 10:52:12 +02:00
Austin Seipp
0399c5ee24
grsecurity: update stable/testing kernels, refactoring
...
This updates the new stable kernel to 3.14, and the new testing kernel
to 3.15.
This also removes the vserver kernel, since it's probably not nearly as
used.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-22 22:29:10 -05:00
Bjørn Forsman
76672dd9e3
accountsservice: be consistent in naming (always two 's')
...
The package is (correctly) named 'accountsservice' (with two 's'), but
the attribute and expression path lacked one 's'. Fix it.
2014-06-22 21:32:16 +02:00
Wout Mertens
ab184b3388
kde: Allow kde_next as a desktop environment
2014-06-22 19:28:18 +02:00
Cillian de Róiste
74cd7cb3c8
sane: environment.variables -> environment.sessionVariables
...
See 13befa3979
for details
2014-06-22 14:38:45 +02:00
Chris Farmiloe
d39684b69b
Simple nixos module to enable configuration of freetds and setup the expected environment variables
2014-06-22 14:24:54 +02:00
Austin Seipp
6cfa38ce7d
nagios: significant upgrades
...
- Upgrade Nagios Core to 4.x
- Expose mainConfigFile and cgiConfigFile in module for finer
configuration control.
- Upgrade Plugins to 2.x
- Remove default objectDefs, which users probably want to customize.
- Systemd-ify Nagios module and simplify directory structure
- Upgrade Nagios package with more modern patch, and ensure the
statedir is set to /var/lib/nagios
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-22 00:22:10 -05:00
Paul Colomiets
11e25f1a3e
Implement per-user socket units
2014-06-20 17:41:14 -04:00
Rob Vermaas
04e648f789
Change size of Amazon EC2 S3-backed images to 8GB (was 4GB).
...
(cherry picked from commit 05543ef6e038a834aa323d467c9ef02ad99c5adb)
2014-06-19 11:28:06 +02:00
Rob Vermaas
fe3a63b7d0
EC2: allow building S3-backed HVM ami's
...
(cherry picked from commit e007559e9580c134f43ea9dc2279ff41cb3bd015)
2014-06-19 10:57:26 +02:00
aszlig
3e64126344
nixos/shadow: Add an example for defaultUserShell.
...
Thanks to @devhell for the suggestion.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:33 +02:00
Austin Seipp
15aee28fa1
Merge pull request #2990 from third3ye/patch-3
...
Minor logic fix
2014-06-18 16:16:58 -05:00
Austin Seipp
e5023b1f45
Merge pull request #2974 from bluescreen303/samba
...
samba really requires its daemons
2014-06-18 16:15:50 -05:00
Austin Seipp
4eb7fdcc13
Merge pull request #2966 from wkennington/master.sudo
...
Update and fix sudo
2014-06-18 16:13:53 -05:00
Austin Seipp
91f1dda340
Merge pull request #2980 from bluescreen303/php-fpm
...
phpfpm: add option for setting php.ini file
2014-06-18 16:08:21 -05:00
Jaka Hudoklin
db8de47ce7
nixos/logstash: add enableWeb option to enable kibana web interface
2014-06-18 13:37:13 +02:00
William A. Kennington III
ef4ea24420
sudo: Always keepVisudo in order to simplify sudo build
2014-06-17 22:41:32 -05:00
Anders Claesson
97d65d8010
nixos manual: fix typo ( close #2997 )
2014-06-17 21:52:22 +02:00
William A. Kennington III
86711e4120
nixos-iso: Re-enable new kernel iso images ( close #2839 )
2014-06-17 21:23:52 +02:00
Ricardo M. Correia
f8e108c865
nixos.tests.installer: Fix test failures due to network being disabled
2014-06-17 18:41:26 +02:00
third3ye
9c83a6bc76
Minor logic fix
...
music_directory "${cfg.musicDirectory}"
playlist_directory "${cfg.dataDir}/playlists"
db_file "${cfg.dataDir}/tag_cache"
state_file "${cfg.dataDir}/state"
sticker_file "${cfg.dataDir}/sticker.sql"
all refer to ${cfg.datadir}, which by default is "/var/lib/mpd/".
Parsing for instance ${cfg.datadir}/playlists results in:
/var/lib/mpd//playlists - NOT FOUND.
2014-06-17 03:24:39 +00:00
Mathijs Kwik
464739c391
samba really requires its daemons
2014-06-16 22:44:27 +02:00
Mathijs Kwik
35df71ac1d
phpfpm: add option for setting php.ini file
2014-06-16 22:44:18 +02:00
Mathijs Kwik
a97bef3e8c
nixos/nginx: fix group and stateDir permissions
...
furthermore, I don't think adding nginx to systemPackages is of any use.
2014-06-16 22:43:58 +02:00
Eelco Dolstra
9ae3654fd6
Fix generation of synergy-{client,server} when disabled
2014-06-16 10:45:09 -04:00
Vladimír Čunát
1200a1ecf3
fixup the previous: got renamed to sessionVariables
...
I'm sorry; I didn't notice Eelco renamed the option.
My dry-run didn't catch that one with nvidia driver, no idea why.
2014-06-15 20:28:30 +02:00
Vladimír Čunát
de783277da
nixos/opengl: add LD_LIBRARY_PATH to systemVariables instead
...
so all users get this variable, thanks to work from #2692 .
2014-06-15 19:18:16 +02:00
Eelco Dolstra
13befa3979
Set session variables in the shell as well
2014-06-13 18:34:56 +02:00
Eelco Dolstra
f5055e2ef6
Rename environment.systemVariables -> environment.sessionVariables
...
This makes it clearer that they're part of PAM sessions.
2014-06-13 17:57:04 +02:00
Eelco Dolstra
a7d31fe449
Handle <nixpkgs> being a symlink
...
Fixes #1898 .
2014-06-13 16:48:49 +02:00
Rob Vermaas
98d6ff9cec
Remove -f from elasticsearch ExecStart, not valid anymore.
2014-06-13 14:00:55 +02:00