Timofey Lagutin
714377f8dc
bittorrentsync: fix storage_path.
...
If this path is a symlink, btsync won't be able to read it if it's not ending with "/".
As seen in f02d4ec9ed
Broken in 0539ed4771
2015-06-05 18:39:01 +03:00
Eelco Dolstra
f1d465f429
pulseaudio: Revert to regular style
...
Also, the NixOS module uses pulseaudioLight in order to prevent
excessive dependency bloat.
2015-06-04 14:54:54 +02:00
Eelco Dolstra
7318ff0e38
Add option ‘system.extraDependencies’ for including stuff in the system closure
...
Mostly useful for installer tests that don't have network access. This
generalizes virtualisation.pathsInNixDB and isoImage.storeContents.
2015-06-04 11:06:44 +02:00
Eelco Dolstra
6bf1853387
Don't include 4 editors in the minimal installation CD
...
Emphasis on "minimal".
2015-06-04 11:06:44 +02:00
lethalman
d144ece04e
Merge pull request #8127 from ip1981/mwlib
...
Add more dependencies for mwlib
2015-06-03 12:50:02 +02:00
Wout Mertens
0666ee4739
Merge pull request #6732 from oconnorr/master
...
Use mktemp to create temporary files to hold ssh host keys and authorized keys
2015-06-02 20:34:43 +02:00
Luca Bruno
c12e1d7278
minimal-iso: enable nixos-manual
2015-06-02 18:14:45 +02:00
Igor Pashev
95c6b835cb
mwlib may use pyfribidi
2015-06-02 06:14:34 +00:00
Igor Pashev
58f6da5cc6
mwlib may use imagemagick (convert)
2015-06-02 06:06:02 +00:00
Bjørn Forsman
70cb6e67c0
nixos/apcupsd: don't evaluate event hooks at build time
...
Better replace the double quotes in 'echo "${commands}"' with single
quotes, to prevent the shell from doing command substitution etc. at
configuration build time.
2015-06-01 22:14:03 +02:00
Eelco Dolstra
64a41b7a90
Use nixUnstable by default
2015-06-01 18:20:28 +02:00
lethalman
3b6dbb1917
Merge pull request #7984 from rushmorem/marathon-module-update
...
Make it easy to override the marathon framework user
2015-06-01 17:06:50 +02:00
Eelco Dolstra
7edb27b7af
Hide the option fonts.enableCoreFonts
...
We shouldn't have options that simply enable a package.
2015-06-01 10:43:43 +02:00
William A. Kennington III
3588cd8c4e
nixos/pulseaudio: Use libpulseaudio
2015-05-29 20:36:46 -07:00
William A. Kennington III
d6cbb061e3
cacert: Build directly from nss instead of our own tarball
2015-05-29 13:52:07 -07:00
William A. Kennington III
aa5d6922c5
Revert "Set boot.loader.grub.configurationLimit to 1 for gce/azure/amazon images. Setting to 0 results in empty grub config."
...
The issue was that grub was not building the default entry which would
leave systems unbootable. This can now be safely reverted as the default
entry is being built once again.
This reverts commit fd1fb0403c
.
2015-05-29 13:26:51 -07:00
William A. Kennington III
1e98da6d99
nixos/grub: Use nixos artwork
2015-05-29 13:26:32 -07:00
William A. Kennington III
159fed47bc
nixos/grub: Fix video display on efi
2015-05-29 13:26:32 -07:00
William A. Kennington III
d4f3930201
nixos/grub: Fix defaultConfig
2015-05-29 13:26:32 -07:00
Russell O'Connor
29b7d76ec8
Remove use of && in fetch-ssh-keys service.
...
Scripts are run with -e so will abort when a command fails.
2015-05-29 19:53:58 +00:00
Russell O'Connor
4744e3541a
[GCE] Put temp files for fetch-ssh-keys service in /run
2015-05-29 19:53:57 +00:00
Russell O'Connor
1badfabc4d
Use mktemp to create temporary files to hold ssh host keys and authorized keys when downloading them from the metadata server.
2015-05-29 19:53:57 +00:00
Rob Vermaas
fd1fb0403c
Set boot.loader.grub.configurationLimit to 1 for gce/azure/amazon images. Setting to 0 results in empty grub config.
2015-05-29 19:36:16 +00:00
rushmorem
9c7fae83ee
Make it easy to override the marathon framework user
...
Currently the module hardcodes the systemd service user to "marathon".
With this change one would not need to create an extra systemd config to
override the user.
So why would one need to override the Marathon user? Some apps require
root access to run. You can't run those with Marathon unless you
override the default user to root. Marathon also provides a
`--mesos_user` command line flag which allows you to run apps using
arbitrary users. You need to run the framework as root to enable this
functionality.
2015-05-29 18:07:07 +02:00
lethalman
cb02d37c31
Merge pull request #8034 from ragnard/apache-kafka-exit-code
...
apache-kafka: Treat exit code 143 as success.
2015-05-28 11:59:06 +02:00
Ragnar Dahlén
9f25762d29
apache-kafka: Treat exit code 143 as success.
...
JVMs exit with exit code 128+signal when receiving a (terminating)
signal. This means graceful termination of a JVM will result in 143, so
add that to `SuccessExitStatus` in systemd service unit.
2015-05-28 10:52:50 +01:00
Wout Mertens
ab0ac154f9
Merge pull request #7302 from ragnard/mesos-slave-without-docker
...
mesos-slave: Docker optional & IP address configurable
2015-05-28 11:43:01 +02:00
Ragnar Dahlén
045e93e0a6
mesos-slave: docker and IP address config options
...
- Usage of docker containerizer is currently hardcoded, this PR makes it
optional. Default is to enable it if docker is enabled.
- Make IP address to listen on part of service configuration.
2015-05-28 06:58:12 +01:00
Nikolay Amiantov
7355066bfe
nixos: add support for exfat filesystem
2015-05-27 18:59:33 +03:00
lethalman
71fc9aac4d
Merge pull request #7992 from ip1981/mwlib
...
Added mwlib services
2015-05-27 16:59:57 +02:00
Igor Pashev
7ed1fb30e2
Added mwlib services
...
Simple local usage:
mwlib = {
nserve = {
enable = true;
};
qserve = {
enable = true;
};
};
For MediaWiki:
$wgCollectionMWServeURL = 'http://localhost:8899 ';
$wgCollectionFormats = array(
'rl' => 'PDF',
'odf' => 'ODT',
);
$wgCollectionPortletFormats = array (
'odf', 'rl'
);
2015-05-27 14:55:22 +00:00
Arseniy Seroka
43690ae4ee
Merge pull request #7987 from magnetophon/das_watchdog-master
...
add das_watchdog: a realtime watchdog
2015-05-27 11:47:15 +03:00
Eelco Dolstra
2a1c342887
Disable the manual in the minimal profile
2015-05-26 20:20:53 +02:00
Bart Brouns
c3b7a8b053
add das_watchdog: a realtime watchdog
2015-05-26 15:13:59 +02:00
Mateusz Kowalczyk
1113efec5e
Merge pull request #7559 from offlinehacker/openvswitch/ipsec
...
openvswitch: ipsec support
2015-05-26 11:26:02 +01:00
Mateusz Kowalczyk
4fd0f2cf4d
Merge pull request #7558 from offlinehacker/nixos/docker/typefix
...
nixos/docker: set extraOptions to separatedString type
2015-05-26 11:22:50 +01:00
Mateusz Kowalczyk
a35e1ddfb2
Merge pull request #7566 from offlinehacker/nixos/node-docker-registry/module
...
nixos: add node docker registry server
2015-05-26 11:07:22 +01:00
Mateusz Kowalczyk
002c687edf
nova-image: Delete no longer used comment
2015-05-26 11:05:52 +01:00
Mateusz Kowalczyk
0d454d863f
Merge pull request #7876 from rzetterberg/issue-7869
...
nixos: Fixes eval and build error of nova image builder
2015-05-26 11:05:06 +01:00
lethalman
aff1c293ef
Merge pull request #7998 from dezgeg/pr-ddclient-ssl
...
ddclient: Set SSL_CERT_FILE environment variable
2015-05-26 10:25:47 +02:00
William A. Kennington III
b07d2a447b
nixos/grub: Fix assertion
2015-05-25 23:03:31 -07:00
Tuomas Tynkkynen
2966068968
ddclient: Set SSL_CERT_FILE environment variable
...
Otherwise connection to SSL hosts fails like this:
May 26 06:44:05 kbuilder ddclient[17084]: WARNING: cannot connect to dynamicdns.park-your-domain.com:443 socket:
IO::Socket::IP configuration failed SSL connect attempt failed with unknown error
error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed
2015-05-26 06:45:25 +03:00
William A. Kennington III
fd5b273e82
nixos/grub: Add the ability to mirror grub to multiple partitions
2015-05-25 20:23:06 -07:00
William A. Kennington III
f42d2503d7
Merge pull request #7643 from Shados/fix-grub-efi-only
...
grub2: Fix EFI-only installation
2015-05-25 13:55:20 -07:00
Aristid Breitkreuz
4835763e13
Trackpoint scrolling on T450s et al
2015-05-25 20:00:35 +02:00
Jonathan Glines
847f8297fc
Added config options for systemd-coredump functionality.
2015-05-24 18:22:53 -06:00
Peter Simons
50fa9d8eea
Merge pull request #7941 from peti/allow-custom-ssh-moduli-file
...
nixos: add config.services.openssh.moduliFile option so that users can replace the default file from OpenSSH
2015-05-22 20:51:42 +02:00
Peter Simons
86d299bc6e
nixos: add config.services.openssh.moduliFile option so that users can replace the default file from OpenSSH
...
The man page for ssh-keygen(1) has a section "MODULI GENERATION" that describes
how to generate your own moduli file. The following script might also be helpful:
| #! /usr/bin/env bash
|
| moduliFiles=()
|
| generateModuli()
| {
| ssh-keygen -G "moduli-$1.candidates" -b "$1"
| ssh-keygen -T "moduli-$1" -f "moduli-$1.candidates"
| rm "moduli-$1.candidates"
| }
|
| for (( i=0 ; i <= 16 ; ++i )); do
| let bitSize="2048 + i * 128"
| generateModuli "$bitSize" &
| moduliFiles+=( "moduli-$bitSize" )
| done
| wait
|
| echo >moduli "# Time Type Tests Tries Size Generator Modulus"
| cat >>moduli "${moduliFiles[@]}"
| rm "${moduliFiles[@]}"
Note that generating moduli takes a long time, i.e. several hours on a fast
machine!
This patch resolves https://github.com/NixOS/nixpkgs/pull/5870 .
2015-05-22 16:28:45 +02:00
viric
bcfa84cae2
Merge pull request #7878 from dezgeg/pr-extlinux
...
generic-extlinux-compatible: Add new bootloader for ARM
2015-05-22 16:02:22 +02:00
William A. Kennington III
31a273cb14
nixos/tinc: users are system users
2015-05-21 20:11:13 -07:00