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
Cillian de Róiste
74cd7cb3c8
sane: environment.variables -> environment.sessionVariables
...
See 13befa3979
for details
2014-06-22 14:38:45 +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
Domen Kožar
5c01d45a62
Merge pull request #2928 from akc/spelling
...
Fix trivial spelling mistake in docs
2014-06-13 13:49:05 +02:00
Rob Vermaas
40566790d3
elasticsearch: run preStart as root, to allow creating the necessary directories.
2014-06-13 13:42:52 +02:00
Anders Claesson
1777724a33
Fix trivial spelling mistake in docs
2014-06-13 11:11:27 +01:00
Bjørn Forsman
aff4394be6
nixos-generate-config: fix nix-env example command
...
An escape char is needed to prevent "$ nix" from being evaluated and
expanded to an empty string. With this change the resulting text is
$ nix-env -qaP | grep wget
instead of
-env -qaP | grep wget
2014-06-12 21:18:21 +02:00
Christoph Hrdinka
8daaa28ac8
nsd-service: add service module for nsd
2014-06-12 11:20:43 +02:00
Michael Raskin
dceda93bd0
Merge pull request #2543 from wizeman/u/zramswap
...
nixos: Add zram swap module
2014-06-12 13:01:29 +04:00
Michael Raskin
8007f32712
Merge pull request #2380 from wkennington/cache.search
...
network-interfaces: Add an option for specifying search to resolv.conf
2014-06-12 12:56:41 +04:00
Kirill Elagin
f81434bdfe
Fix trying to add users to non-existent groups
2014-06-11 13:36:15 +04:00
Kirill Elagin
1208dd4df0
Fix configuring apache with extra user/group
...
This fix is consistent with all the other modules.
2014-06-11 13:17:42 +04:00
Kirill Elagin
80721cdd41
Revert "Fix configuring httpd with custom user/group."
...
This reverts commit 08f9da2e8e
.
2014-06-11 13:17:00 +04:00
Rob Vermaas
08f9da2e8e
Fix configuring httpd with custom user/group.
2014-06-11 10:18:37 +02:00
Evgeny Egorochkin
b415876bdb
systemd service: fix issues with escaping when unit name contains '-'
...
systemd escaping rules translate this into a string containing '\'
which is treated by some code paths as quoted, and by others as unquoted
causing the affected units to fail.
2014-06-11 04:08:13 +03:00
Gergely Risko
068c7fd037
Fix nixos-rebuild.sh to depend on Nix
...
And therefore always choose the correct architecture for the rebuilt
system regardless for the PATH setting of the user.
2014-06-10 20:13:47 +02:00
Eelco Dolstra
8ae659f16c
Revert "Revert "Merge #2692 : Use pam_env to properly setup system-wide env""
...
This reverts commit 491c088731
.
2014-06-10 13:07:10 +02:00
Eelco Dolstra
491c088731
Revert "Merge #2692 : Use pam_env to properly setup system-wide env"
...
This reverts commit 18a0cdd864
.
2014-06-10 13:03:44 +02:00
Vladimír Čunát
18a0cdd864
Merge #2692 : Use pam_env to properly setup system-wide env
2014-06-10 11:42:59 +02:00
Sander van der Burg
6b6f098fd1
disnix: bump versions and update module to use its latest features
2014-06-09 23:46:30 +02:00
lethalman
f5aeae49ef
Merge pull request #2837 from lethalman/security
...
Add system.replaceRuntimeDependencies to quickly replace system dependencies
2014-06-09 15:42:59 +02:00
Sander van der Burg
33d99a22ca
nixos-build-vms: Fix function invocation to test driver
2014-06-09 13:36:26 +02:00
Bjørn Forsman
054a3c0321
nixos/graphite-service: clean up restartTriggers
...
Currently, the restartTriggers are abusing the systemd unit file in that
the cfg.carbon.config/storageAggregation/... option text is pasted into
the unit file. Even though this sort-of works (the service is restarted
if the config changes) this causes systemd to print error messages about
invalid sections (rightfully so!).
The correct use of restartTriggers is to list storage paths, which is
what this change does. If any of the
cfg.carbon/config/storageAggregation/... options change, configDir will
get a new hash. It is not as "fine grained" as the current version, but
it is not abusing the interface.
Also, remove unneeded 'waitress' in one of the restartTriggers, because
it is already listed as part of the service config.
2014-06-09 11:40:33 +02:00
Bjørn Forsman
208d466c21
nixos/graphite-service: make option descriptions end with '.'
...
Because that is how it is supposed to be.
2014-06-09 11:40:28 +02:00
William A. Kennington III
ab29b6527f
nixos-iso: Use a simpler disk label
...
When formatting a nixos usb using my windows machine I noticed that the
disk labeling using periods was not compatible with my linux kernel /
udev recognition. When labeling a volume NIXOS_14.10 under Windows, it would
show up as NIXOS_14_10 on NixOS. This meant that /dev/root would never come
up at boot time, preventing the livecd from starting.
This patch works around this issue by eliminating any special characters
other than underscores. The previous versioning didn't seem all that
useful, especially when consdering there are many different version of
the year.month named iso.
2014-06-08 15:53:45 -05:00
Michael Raskin
e68a5b265a
Enable checking sudoers syntax. Fixes #2850 , probably.
2014-06-09 00:54:21 +04:00
Bjørn Forsman
0195628118
nixos/statsd-service: fix 'graphitePort' default value
...
graphitePort must point to the port that carbon-cache listens on, not
the graphite webUI port.
With this change I finally got data from statsd to graphite.
2014-06-08 16:10:39 +02:00
Bjørn Forsman
476a3d818f
nixos/graphite-service: fix filename typo
...
It's "aggregation" with two 'g's.
Fixes this:
carbon-cache[9363]: [console] /nix/store/drxq4jj92sjk3cjik2l4hnsndbray3i4-graphite-config/storage-aggregation.conf not found, ignoring.
2014-06-07 23:45:17 +02:00
Florian Friesdorf
0136fcb3df
Merge pull request #2726 from pSub/trackpoint
...
Added an option to configure sensitivity and speed of trackpoints.
2014-06-07 13:09:26 +02:00
Luca Bruno
66ddb1c322
Add system.replaceRuntimeDependencies to quickly replace system dependencies
2014-06-06 21:17:31 +02:00
Rok Garbas
cc160a196a
couchdb service: adding customizable config file which is writable by couchdb
2014-06-06 15:30:58 +01:00
Luca Bruno
94c2661503
tomcat: fix service to be a daemon, and run tomcat in script rather than preStart
2014-06-06 14:04:35 +02:00
Moritz Ulrich
f6d03359b3
Only overwrite container-configuration when --config is specified.
...
Fixes #2834 .
2014-06-06 11:49:16 +02:00
Eelco Dolstra
906aa9ccb1
Make pseudo-filesystems show up as "tmpfs" etc. rather than "none" in df
2014-06-05 13:39:17 +02:00
Luca Bruno
12f06b3cc3
fcgiwrap: new package
...
Simple server for running CGI applications over FastCGI
https://nginx.localdomain.pl/wiki/FcgiWrap
2014-06-04 10:20:19 +02:00
Ricardo M. Correia
abd0b3f411
nixos.tests.installer: Attempt to fix race condition
...
Attempt to fix race condition in installer tests, especially the
grub1 test.
The latter was failing when running "parted /dev/sda ..." because
/dev/sda didn't exist yet.
2014-05-30 21:26:24 +02:00
Peter Simons
ce7be7584f
Merge pull request #2790 from ehmry/unbound
...
unbound: update from 1.4.21 to 1.4.22, service from Upstart to systemd
2014-05-30 14:46:29 +02:00
Rickard Nilsson
5bf076d99b
sane: Make SANE_CONFIG_DIR overrideable
2014-05-30 10:18:39 +02:00
Emery Hemingway
0ddce8db12
unbound: update from 1.4.21 to 1.4.22, service from Upstart to systemd
2014-05-29 09:59:55 -04:00
Peter Simons
642449da18
Merge pull request #2782 from soenkehahn/better_error_message_missing_uid
...
better error message in case of missing uids
2014-05-28 20:59:43 +02:00
Edward Tjörnhammar
d1277ddcc2
Adding Radicale package and service
2014-05-28 20:41:39 +02:00
Luca Bruno
a013d00448
nautilus-sendto: new package
...
Integrates Evolution and Pidgin into the Nautilus file manager
2014-05-28 17:27:48 +02:00
Luca Bruno
bf6ddc6285
nautilus 3.12: find extensions
2014-05-28 17:27:48 +02:00
Eelco Dolstra
a8c9c11f9e
Manual: Note about using a local branch
2014-05-28 14:38:07 +02:00
Sönke Hahn
089b293019
better error message in case of missing uids
2014-05-28 20:12:53 +08:00
Rob Vermaas
e328471b8a
Merge pull request #2777 from offlinehacker/nixos/influxdb/add
...
nixos: add influxdb module
2014-05-28 08:32:37 +02:00
Shea Levy
57ed344917
Fix /run/keys permissions
2014-05-27 17:22:25 -04:00
Jaka Hudoklin
66456c0798
nixos: add influxdb module
2014-05-27 22:56:36 +02:00
Alexei Robyn
4fa4518875
Add TeamSpeak 3 server & service module ( close #2056 )
...
Conflicts (trivial):
lib/maintainers.nix
nixos/modules/misc/ids.nix
2014-05-27 17:30:26 +02:00
Michael Raskin
80cc011f77
Merge pull request #2617 from ttuegel/hplip
...
hplip: update and fix scanning
2014-05-27 02:31:27 -07:00
Michael Raskin
2e5e49c306
Merge pull request #2424 from wkennington/cache.sshKey
...
ssh: Support knownHost public keys as strings
2014-05-27 01:46:12 -07:00
Michael Raskin
19ce0416f1
Merge pull request #2416 from edwtjo/encdev-module
...
Enable encrypted backing devices in fileystem configurations
2014-05-27 01:45:17 -07:00
Luca Bruno
6b21186742
gnome 3.12: make remote desktop sharing work
2014-05-26 17:18:04 +02:00
Luca Bruno
2131313fa6
Add gvfs dbus service and gvfs gio modules to gnome 3
...
Closes #2746
2014-05-26 11:13:51 +02:00
Luca Bruno
b0234f216c
Fix passing extra qemu opts when using boot loader
2014-05-25 21:37:02 +02:00
Bjørn Forsman
15beb4054d
nixos: add 'gvfs' when using GNOME3 desktop
...
One reason for adding this is to make Chromium able to open files it has
downloaded.
Currently this happens:
/run/current-system/sw/bin/xdg-open: line 364: gnome-open: command not found
(And nothing happens in the GUI when clicking a downloaded file.)
Looking into xdg-open, one can see that it first tries to run gvfs-open
and then falls back to gnome-open. Adding 'gvfs' makes the first command
succeed.
2014-05-25 14:17:36 +02:00
Peter Simons
c18775837c
nixos/modules/services/audio/alsa.nix: fix evaluation
...
https://github.com/NixOS/nixpkgs/issues/2732
2014-05-23 19:20:49 +02:00
Arseniy Seroka
dc8625305a
fix mistake
2014-05-23 14:58:07 +04:00
Arseniy Seroka
c84d81541e
alsa: add option to change system wide configuration
2014-05-23 14:53:24 +04:00
Pascal Wittmann
128636ff24
Added an option to configure sensitivity and speed of trackpoints.
2014-05-23 10:18:03 +02:00
Vladimír Čunát
4241e30874
Merge pull request #2719 from wizeman/u/transmission-upd
...
transmission: Update from 2.82 -> 2.83 + fixes
2014-05-22 21:11:34 +02:00
Ricardo M. Correia
f0cf8f4140
grsecurity: Fix module evaluation
2014-05-22 20:17:34 +02:00
Ricardo M. Correia
a131baf502
transmission: Fix apparmor rules to allow loading more libraries
2014-05-22 19:46:08 +02:00
Eelco Dolstra
58226a7b06
Add type for fonts.fonts option
2014-05-22 14:20:23 +02:00
Eelco Dolstra
f4b7ac11a3
Remove udisks module
...
It's no longer used in NixOS.
2014-05-22 12:11:53 +02:00
Eelco Dolstra
0bc7ec6e28
Remove obsolete udisks test
...
Closes #2716 .
2014-05-22 12:11:53 +02:00
Eelco Dolstra
7fd13ddc66
Set TZDIR for all systemd services
...
This only matters if a service also overrides the $TZ variable.
Issue #2447 .
2014-05-21 18:31:40 +02:00
Luca Bruno
927b385cc9
Fix mumble test: wait for X windows to appear, not only sleep
2014-05-21 18:09:21 +02:00
Rob Vermaas
973fa21b52
Better support for HVM instances. Now the NixOS images can
...
be used on HVM instances without needing nixops. Previously
the grub setup was incorrect, so a plain 'nixos-rebuild switch'
and a reboot would result in a broken system.
Also added growing of the partition of the root disk in the initrd,
so you can run resize2fs after initial boot, without needing an
extra reboot. This is useful especially for nixops'
deployment.ec2.ebsInitialRootDiskSize option.
(cherry picked from commit 044a24e58bcf4cf48df02df936c542839fb08d90)
2014-05-21 16:37:55 +02:00
Rob Vermaas
cdfb8738a4
Use HVM instance for EBS creator, guarantees everything is created in the correct zone.
...
(cherry picked from commit c9763e20e5e793be5eef155601f59dd7639c7ba3)
2014-05-21 16:37:55 +02:00
Rob Vermaas
3da94435c0
Add option ec2.hvm, to set some boot configuration specific for EC2 HVM instances.
...
(cherry picked from commit 35c76d917307b7ac405486855cfe63021810dba5)
Conflicts:
nixos/modules/virtualisation/amazon-image.nix
2014-05-21 16:37:53 +02:00