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
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
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
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
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