Commit graph

2295 commits

Author SHA1 Message Date
Eelco Dolstra 574173f0e6 Merge pull request #7027 from ecraven/apache-sslchain
apache-httpd: adding support for sslServerChain
2015-04-13 16:48:20 +02:00
Peter Feigl 3837ef82ad fixing documentation 2015-04-13 15:42:01 +02:00
Peter Feigl e5b3918f85 apache-httpd: adding support for sslServerChain 2015-04-13 15:41:10 +02:00
Peter Feigl 69b18fc4b6 fixing indentation 2015-04-13 13:46:42 +02:00
Peter Feigl 44ea83b986 changed config to only include the minimum necessary 2015-04-13 13:10:04 +02:00
Peter Feigl 49eb77b26c apache-httpd: adding subservice moodle 2015-04-13 13:06:39 +02:00
Eelco Dolstra 4466707ddf switch-to-configuration: Better error checking 2015-04-13 12:28:12 +02:00
Joachim Schiele 85c454ab1d Merge pull request #6785 from qknight/wordpress
zef hemel's wordpress.nix adapted to extraSubservices
2015-04-13 10:27:55 +02:00
Rickard Nilsson 3620b27a66 mpd: Make it possible to specify db file path 2015-04-10 23:10:14 +02:00
Eelco Dolstra d923a6eab5 Make environment.checkConfigurationOptions an alias
NixOps uses it, and we can't change it there for
backward-compatibility reasons.
2015-04-10 16:11:07 +02:00
Nicolas B. Pierron 9647a72835 Fix amazon default configuration.nix file. 2015-04-09 22:18:13 +02:00
Vladimír Čunát 5aa9b72400 nixos: typo in docker option description 2015-04-09 20:58:20 +02:00
Nicolas B. Pierron 296e6c4991 Fix #7252 - NixOS Manual: Carry the current system value to evaluation of the manual. 2015-04-08 23:14:19 +02:00
Nicolas B. Pierron 3eef61a6eb NixOS Manual: Do not use unfree packages as default value. 2015-04-08 23:14:19 +02:00
Joachim Fasting c5ec6ef609 window-managers: add missing import ratpoison 2015-04-08 14:14:37 +02:00
William A. Kennington III 6ffd44c4c3 nvidia: 346.47 -> 346.59 2015-04-07 13:24:55 -07:00
Oliver Matthews 09179b603f allow changing minecraft data dir + allow opening firewall 2015-04-07 14:10:13 +00:00
Eelco Dolstra a38f130126 Revert "Set stricter permissions on /nix/store"
This reverts commit 066758758e because
it breaks NixOS VM tests.
2015-04-07 15:10:41 +02:00
Domen Kožar 42c421adc3 Merge pull request #7180 from jagajaga/fix_generator
Fixing nixos-generate-config
2015-04-07 12:24:04 +02:00
Arseniy Seroka e52e160190 Merge pull request #7215 from cwoac/btsync2
Add support for btsync 2.x branch
2015-04-06 18:50:05 +03:00
Oliver Matthews 0539ed4771 Add support for btsync 2.x branch 2015-04-06 15:31:40 +00:00
Domen Kožar ad197d89ae Merge pull request #7181 from jagajaga/teamviewer
Teamviewer
2015-04-06 14:13:07 +02:00
Tobias Geerinckx-Rice f02651ee9b Merge pull request #7204 from fpletz/fix/hotplug_helper
Check if /proc/sys/kernel/hotplug exists before writing
2015-04-06 13:55:29 +02:00
Domen Kožar 7c7f426b3f Merge pull request #7164 from rzetterberg/master
Fixes minetest mesa 10.* incompatibility, adds minetest server service
2015-04-06 10:46:26 +02:00
Franz Pletz 16d25f4fa6 Check if /proc/sys/kernel/hotplug exists before writing
If a kernel without CONFIG_UEVENT_HELPER set is used with NixOS, the file
/proc/sys/kernel/hotplug does not exist. Before writing to it to disable
this deprecated mechanism, we have to ensure it actually exists because
otherwise the activation script will fail.
2015-04-06 09:23:58 +02:00
Arseniy Seroka 0998212640 impl: teamviewer daemon 2015-04-05 20:47:01 +03:00
Arseniy Seroka b11f662617 fix https://github.com/NixOS/nixpkgs/issues/3560 2015-04-05 16:12:14 +03:00
William A. Kennington III b3c423757e nixos/rdnssd: Major refactoring
This updates rdnssd to the following:
* Using the systemd interfaces directly
* Using the rdnssd user instead of the root user
* Integrating with resolvconf instead of writing directly to /etc/resolv.conf
2015-04-04 21:20:07 -07:00
Richard Zetterberg 0b1f994f29 Adds minetest server service 2015-04-04 12:36:43 +02:00
William A. Kennington III c0cb4e1ef7 nixos/nvidia: Add a temporary hack to support kernel 4.0 2015-04-03 21:53:34 -07:00
Nicolas B. Pierron 6de931a0f8 Merge rename.nix changes. 2015-04-03 23:12:12 +02:00
Arseniy Seroka 8592c6c004 Merge pull request #7150 from joachifm/grsec-types
grsecurity module: use types.enum
2015-04-03 16:03:49 +03:00
Joachim Fasting ba93a75724 grsecurity module: use types.enum
Also
- set desktop as default system
- make virtualisationSoftware nullOr
- make virtualisationConfig nullOr
2015-04-03 13:45:45 +02:00
Austin Seipp 1c1083345b Merge pull request #7058 from joachifm/sysctl-kptr-restrict
nixos: condition sysctl.kptr_restrict on features.grsecurity
2015-04-03 04:13:19 -05:00
Arseniy Seroka 4fa554e32b Merge pull request #7017 from obadz/sg+sudo-g
Ability to switch groups with sg and sudo -g
2015-04-02 02:11:10 +03:00
William A. Kennington III ff21171921 Fix references to current-system/sw/sbin 2015-04-01 13:57:36 -07:00
William A. Kennington III a9f2e107d0 Revert "Remove obsolete .../sbin directories from $PATH"
This reverts commit 98cedb3d22.
2015-04-01 13:57:36 -07:00
aszlig 224ed7e798
nixos/hardware: Add option to enable KSM.
This is essentially what's been done for the official NixOS build slaves
and I'm using it as well for a few of my machines and my own Hydra
slaves.

Here's the same implementation from the Delft server configurations:

f47c2fc7f8/delft/common.nix (L91-L101)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-01 20:00:27 +02:00
Eelco Dolstra 1c39a47ac8 Reload, don't restart, dbus.service
Many bus clients get hopelessly confused when dbus-daemon is
restarted. So let's not do that.

Of course, this is not ideal either, because we end up stuck with a
possibly outdated dbus-daemon. But that issue will become irrelevant
in the glorious kdbus-based future.

Hopefully this also gets rid of systemd getting stuck after
dbus-daemon is restarted:

Apr 01 15:37:50 mandark systemd[1]: Failed to register match for Disconnected message: Connection timed out
Apr 01 15:37:50 mandark systemd[1]: Looping too fast. Throttling execution a little.
Apr 01 15:37:51 mandark systemd[1]: Looping too fast. Throttling execution a little.
...
2015-04-01 16:57:16 +02:00
Eelco Dolstra 98cedb3d22 Remove obsolete .../sbin directories from $PATH 2015-04-01 16:22:12 +02:00
Eelco Dolstra fdfe4b7cde Remove unnecessary symlinks in /nix/var/nix/gcroots 2015-04-01 14:45:02 +02:00
William A. Kennington III 8028357084 nixos/mysql: Cleanups 2015-03-31 16:17:55 -07:00
Vladimír Čunát 81fc066900 Merge #4678: nixos iso-image: support USB booting
by using syslinux (i.e. support the dd-method in addition to unetbootin).
@vcunat tidied the PR by squashing closely related changes together.
2015-03-31 15:12:16 +02:00
obadz be7f104502 sg: add setuid wrapper. (newgrp is a symlink to sg and was already setuid).
sudo: add ability for wheel users to change group (as well as user)
2015-03-30 23:50:45 +01:00
Nikolay Amiantov 7c03829024 Merge pull request #7060 from abbradar/nm-l2tp
Support L2TP in NetworkManager
2015-03-30 23:05:42 +03:00
Edward Tjörnhammar 1092b9da48 Merge pull request #7066 from edwtjo/xbmc-pruning
Remove XBMC expressions in favor of the Kodi ones
2015-03-30 21:46:29 +02:00
Edward Tjörnhammar 1345a65765 Remove XBMC expressions in favor of the Kodi ones 2015-03-30 21:43:32 +02:00
lethalman f72b0c43f6 Merge pull request #6762 from lethalman/nixos-install
nixos-install: support -j, --cores and --option. Closes #6755
2015-03-30 18:06:53 +02:00
lethalman dc560b5b02 Merge pull request #7031 from cwoac/mediatomb
Add MediaTomb service
2015-03-30 17:49:46 +02:00
Luca Bruno eac32cf697 Revert "Merge pull request #7032 from flosse/change-option-names"
This reverts commit c265aafb55, reversing
changes made to c9bbf2228f.

Breaks evaluation, see https://github.com/NixOS/nixpkgs/pull/7032#issuecomment-87641471
2015-03-30 13:45:07 +02:00