William A. Kennington III
d0e15cc575
Merge pull request #4983 from bosu/fw-stop-fix
...
firewall: clear rpfilter on stop
2014-11-14 00:14:27 -08:00
Boris Sukholitko
53b24d0c95
firewall: clear rpfilter on stop
2014-11-14 09:07:18 +02:00
Moritz Ulrich
e884dc32c5
Add local-fs.target to minidlna.
...
Minidlna fails to start if it wants to access a filesystem which isn't
mounted (yet).
2014-11-12 23:20:47 +01:00
Michael Raskin
0d6306be4d
Merge pull request #4950 from joachifm/dnscrypt-proxy
...
dnscrypt-proxy service
2014-11-13 00:25:05 +03:00
Longrin Wischnewski
490232bd2e
apache-httpd: add mod_access_compat for compatibility with old httpd-22 configurations
2014-11-12 13:18:02 +01:00
Joachim Fasting
52f0553209
Add dnscrypt-proxy service
...
The dnscrypt-proxy service relays regular DNS queries to
a DNSCrypt enabled upstream resolver.
The traffic between the client and the upstream resolver is
encrypted and authenticated, which may mitigate the risk of
MITM attacks and third-party snooping (assuming a trustworthy
upstream).
Though dnscrypt-proxy can run as a standalone DNS client,
the recommended setup is to use it as a forwarder for a
caching DNS client.
To use dnscrypt-proxy as a forwarder for dnsmasq, do
```nix
{
# ...
networking.nameservers = [ "127.0.0.1" ];
networking.dhcpcd.extraConfig = "nohook resolv.conf";
services.dnscrypt-proxy.enable = true;
services.dnscrypt-proxy.localAddress = "127.0.0.1";
services.dnscrypt-proxy.port = 40;
services.dnsmasq.enable = true;
services.dnsmasq.extraConfig = ''
no-resolv
server=127.0.0.1#40
listen-address=127.0.0.1
'';
# ...
}
```
2014-11-11 22:47:19 +01:00
Luca Bruno
6af0d6974f
Merge branch 'master' into staging
2014-11-10 10:03:52 +01:00
Michael Raskin
6d0518fbdf
Merge pull request #4282 from sztupi/crashplan
...
Crashplan
OK, it is an external service with unfree client, so let's declare that ensuring usability of the service is not our headache.
2014-11-09 18:09:33 +03:00
Edward Tjörnhammar
c329e5bbd9
i2pd: added package, service
2014-11-09 09:55:35 +01:00
Emery Hemingway
67a2a58314
cjdns: service tweaks, new NixOS test
2014-11-08 23:39:02 +01:00
Nikolay Amiantov
aeaa96f7e4
xfce4-volumed: add package ( close #4628 )
2014-11-08 21:48:51 +01:00
Aristid Breitkreuz
8b949e5ff5
Merge pull request #4823 from abbradar/synaptics-fix
...
synaptics: fix tapButtons setting
2014-11-08 19:38:06 +01:00
Aristid Breitkreuz
8b50383c45
Merge pull request #4859 from abbradar/git-daemon
...
nixos/git-daemon: fix a bug and add 'user' and 'group' options
2014-11-08 19:33:24 +01:00
Domen Kožar
9ea81152cc
Merge pull request #4891 from pSub/prefer-xresources
...
Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670
2014-11-08 19:32:46 +01:00
Luca Bruno
83221f3886
Merge branch 'master' into staging
...
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Pascal Wittmann
d6e87f1749
Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670
2014-11-08 15:25:40 +01:00
Aristid Breitkreuz
cf4a976ced
quassel: make a proper systemd unit (also properly works in containers now)
2014-11-08 14:59:25 +01:00
Nikolay Amiantov
46b866cf63
nixos/git-daemon: fix 'exportAll' option
2014-11-07 15:50:01 +03:00
Nikolay Amiantov
af1d09879b
nixos/git-daemon: add 'user' and 'group' options
2014-11-07 15:49:45 +03:00
Nikolay Amiantov
4b2e43865a
nixos/git-daemon: add types
2014-11-07 15:49:03 +03:00
Rickard Nilsson
71f64ded06
Revert "Revert "syslog-ng: Update from 3.5.6 to 3.6.1""
...
This reverts commit 8e1072fd60
.
2014-11-06 21:59:04 +01:00
Rickard Nilsson
2b3c3d0e32
Fixes to Apache 2.4 configuration
2014-11-06 21:58:40 +01:00
Eelco Dolstra
b3eb981a95
apache-httpd: Make 2.4 the default
...
The NixOS 14.11 release is a good time to finally make 2.4 the
default.
2014-11-06 14:55:44 +01:00
Evgeny Egorochkin
85d23f5292
thermald needs dbus config files to run
2014-11-06 15:19:33 +02:00
Vladimír Čunát
52404a868d
Merge recent master into staging
...
Nixpkgs Hydra: ?compare=1157272
TODO: port e22889064f
Conflicts:
nixos/tests/gnome3_10.nix (auto-solved)
pkgs/applications/video/aegisub/default.nix
pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Jaka Hudoklin
d232390d5d
nixos/graphite: fix user creation
2014-11-04 19:38:24 +01:00
Ricardo M. Correia
98a59df81f
nixos/transmission: Start after local-fs.target
2014-11-04 18:40:13 +01:00
Nikolay Amiantov
5f84c785ff
synaptics: fix tapButtons setting
2014-11-04 06:20:10 +03:00
lethalman
636a4c00ca
Merge pull request #4801 from robberer/pkgs/zabbix-server
...
zabbix-server: add extraConfig option
2014-11-04 00:32:46 +01:00
Longrin Wischnewski
ce8e1a278b
zabbix-server: add extraConfig option
...
add types to options
2014-11-03 16:47:07 +01:00
William A. Kennington III
8e1072fd60
Revert "syslog-ng: Update from 3.5.6 to 3.6.1"
...
This reverts commit e2ada42623
.
2014-11-02 17:22:28 -08:00
Peter Simons
a9c53037fa
Merge remote-tracking branch 'origin/master' into staging.
2014-11-02 16:15:53 +01:00
Peter Simons
415f41bf68
nixos/modules/services/monitoring/graphite.nix: strip trailing whitespace
2014-11-02 12:40:00 +01:00
Peter Simons
96a7e65c37
nixos/modules/services/monitoring/graphite.nix: don't create graphite user unconditionally
...
I'm not sure what exactly this user is needed for, i.e. under what circumstances
it must exist or not, but creating it unconditionally seems like the wrong thing
to do. I complained to @offlinehacker about this on Github, but got no response
for a week or so. I'm disabling the extraUsers bit to put out the fire, and now
hope that someone who actually knows about Graphite implements a proper solution
later.
2014-11-02 12:34:16 +01:00
Nikolay Amiantov
5423f62373
gitolite: add dataDir
2014-11-02 02:24:41 +03:00
lethalman
f079cd1721
Merge pull request #4750 from abbradar/nix-maxcores
...
Add buildCores option to nix
2014-11-01 22:01:39 +01:00
Nikolay Amiantov
e8dace201f
nix-daemon: add maxCores option
2014-11-01 23:58:21 +03:00
William A. Kennington III
ba53392bce
nixos/nat: Fix override so that sysctls are properly preserved
2014-10-31 16:50:25 -07:00
Peter Simons
b11060d8db
Merge remote-tracking branch 'origin/master' into staging.
2014-10-31 11:14:24 +01:00
Peter Simons
e18e77fbcd
Merge pull request #4746 from abbradar/synaptics-fingers
...
Add "fingersMap" option to Synaptics
2014-10-31 11:06:58 +01:00
Nikolay Amiantov
118096fc0b
synaptics: add fingersMap option
2014-10-31 12:45:54 +03:00
Nikolay Amiantov
0eb86647b3
synaptics: add types to options
2014-10-31 12:45:54 +03:00
Aristid Breitkreuz
93f2c180d0
rsnapshot: add git version & make it configurable in the nixos module
2014-10-27 20:38:39 +01:00
Kirill Elagin
0c6d49da7d
xsession: Start the right pulseaudio binary
...
Fixes #4663 .
2014-10-27 15:43:19 +03:00
Rickard Nilsson
e2ada42623
syslog-ng: Update from 3.5.6 to 3.6.1
...
Also update the NixOS module, syslog-ng now automatically listens to
the systemd journal, so we don't have to set up syslog.socket.
2014-10-27 12:22:22 +01:00
lethalman
40b5aa1d33
Merge pull request #4506 from cstrahan/logstash-config
...
logstash service: make log verbosity configurable.
2014-10-26 20:10:03 +01:00
Aristid Breitkreuz
dabdab8dce
Merge pull request #4640 from lethalman/installer-icons
...
kde installer: Add gparted, nixos manual and konsole in the desktop
2014-10-25 16:32:56 +02:00
Eelco Dolstra
f4be4f5e54
Merge remote-tracking branch 'origin/master' into staging
2014-10-24 12:24:13 +02:00
Luca Bruno
9e1ab43459
gnome3: Add cantarell fonts. Closes #4633
2014-10-24 11:50:47 +02:00
Luca Bruno
e553e27f48
kde installer: Add gparted, nixos manual and konsole in the desktop
2014-10-23 18:59:25 +02:00
Vladimír Čunát
2cf17b0802
Merge recent master into staging
...
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Domen Kožar
3b133beb7a
Merge pull request #4553 from ehmry/polipo
...
drop permission prestart from polipo service module
2014-10-23 12:51:36 +02:00
Thomas Tuegel
da77d9f409
Merge pull request #4614 from geerds/kde4-plasma-nm
...
kde4: Use plasma-nm instead of knetworkmanager
2014-10-22 20:28:36 -05:00
Jascha Geerds
83ae3042a7
kde4: Use plasma-nm instead of knetworkmanager
2014-10-22 13:27:19 +02:00
Emery Hemingway
a3338abcfe
cjdns: add peer hostnames to extraHosts, option for external config
2014-10-21 13:16:04 -04:00
Georges Dubus
50be0d5447
Removed the kde4_next nixos module
...
Merged its differences into kde4. This commit fixes #4519 .
2014-10-21 14:04:28 +02:00
Jaka Hudoklin
594f354bc7
nixos/graphite: fix grahite api documentation url
2014-10-20 13:32:58 +02:00
Jaka Hudoklin
09c8d909fb
nixos/graphite: update docs, add graphite pager
2014-10-20 13:27:21 +02:00
Eelco Dolstra
a3b873924b
Let the kernel load firmware directly
...
Loading firmware via udevd is obsolete. Fixes #4552 .
2014-10-20 13:25:00 +02:00
Vladimír Čunát
359dd3b8ac
nixos: fix two pipefail problems
...
It failed since 3c6efec2c0
, i.e. #4453 .
Now it should "work" the same as before.
2014-10-19 19:29:28 +02:00
Jaka Hudoklin
988ed87e70
nixos/neo4j: add package option
2014-10-18 13:18:37 +02:00
Emery Hemingway
32d6ae7ed9
drop permission prestart from polipo service module
...
chowning the cache directory can timeout the service, permissions
on this directory should never change without user intervention
2014-10-16 10:57:16 -04:00
Eelco Dolstra
09dc132e04
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Rickard Nilsson
135d677690
nixos/logrotate: Fix spelling mistake
2014-10-16 08:20:43 +02:00
Rickard Nilsson
cdba59d0f2
nixos/syslog-ng: Add option configHeader
2014-10-16 08:14:45 +02:00
Rickard Nilsson
2ffe274486
nixos/logrotate: Specify type for config option
2014-10-15 16:52:50 +02:00
Domen Kožar
bc015be0f3
fix eval
2014-10-15 12:00:20 +02:00
Lluís Batlle i Rossell
f594033822
nixos nfs: allow setting the lockd ports.
...
This helps in setting a fixed firewall open port for NFS lockd.
Based on:
http://rlworkman.net/howtos/NFS_Firewall_HOWTO
(cherry picked from commit b32ca0616ff70795f71995fa79ea508b82f30b3a)
Conflicts:
nixos/modules/services/network-filesystems/nfsd.nix
2014-10-15 10:59:33 +02:00
Joachim Schiele
13298fcbb9
Merge pull request #4535 from flosse/lua-bitop
...
lua-packages: added lua-bitop to add websocket support for prosody
2014-10-15 09:41:32 +02:00
Markus Kohlhase
5308d3284b
prosody: added websocket support
2014-10-15 03:57:00 +02:00
Rickard Nilsson
54a0ac090c
nixos/syslog-ng: Replace option serviceName with listenToJournal. Fix socket activation
2014-10-14 15:38:42 +02:00
Mateusz Kowalczyk
b9c2fe5fd8
Merge pull request #4400 from matejc/seeksservice
...
seeks: update and write nixos module
2014-10-13 21:37:11 +01:00
Charles Strahan
dc2fac7c0c
logstash service: make log verbosity configurable.
2014-10-13 15:48:41 -04:00
Michael Raskin
2ef0a17561
Merge pull request #4387 from 1126/refactor-stumpwm
...
stumpwm: update and refactoring
2014-10-13 17:50:46 +04:00
Matej Cotman
561d3b3860
seeks: nixos module
2014-10-13 13:10:49 +02:00
Jaka Hudoklin
dd0758ab6b
Merge pull request #4392 from cstrahan/logstash
...
logstash service improvements
2014-10-12 23:02:52 +02:00
Joachim Schiele
df95acd13c
Merge pull request #3960 from flosse/prosody-service
...
Prosody service
2014-10-11 23:10:05 +02:00
Markus Kohlhase
d86c2c30c5
prosody: packaged as a service
...
Conflicts:
nixos/modules/misc/ids.nix
2014-10-11 18:53:43 +02:00
Domen Kožar
1992bd1331
Merge pull request #4409 from iElectric/redmine
...
Add Redmine package and NixOS Service
2014-10-07 13:41:46 +02:00
Shea Levy
3432414808
Merge branch 'nixos-cronfiles' of git://github.com/rickynils/nixpkgs
...
nixos: Add option services.cron.cronFiles
2014-10-07 05:59:03 -04:00
Domen Kožar
b4a335cd59
nixos: add redmine service
2014-10-07 10:55:50 +02:00
Eelco Dolstra
a85dcf4a00
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/libav/default.nix
pkgs/shells/bash/bash-4.2-patches.nix
pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Charles Strahan
fc7098abf7
logstash service improvements
...
* add logstash-contrib plugins package
* add additional options to the logstash service
2014-10-05 21:53:05 -04:00
Bjørn Forsman
fca51849ec
nixos/lighttpd: add services.lighttpd.enableModules option
...
This option makes the coupling between lighttpd and its sub-services
more "loose".
While the option is a list, its purpose is to provide a "set" of needed
modules to load for lighttpd to function correctly with its config. The
NixOS lighttpd module ensures that lighttpd modules are loaded no more
than once (because lighttpd dislikes that), and in the correct order.
Also add an assertion that all modules listed in .enableModules are
valid.
2014-10-05 19:15:19 +02:00
Vladimír Čunát
e4436ad841
FONTCONFIG_FILE: remove setters to /etc/fonts/fonts.conf
...
Any reasonably new version of fontconfig does search that path by default,
and setting this globally causes problems, as 2.10 and 2.11 need
incompatible configs.
Tested: slim+xfce desktop, chrootenv-ed steam.
I have no idea why we were setting the global variable;
e.g., neither Fedora nor Ubuntu does that.
2014-10-05 17:05:27 +02:00
_1126
7536d41287
stumpwm: update and refactoring
...
This commit updates the stumpwm to version 0.9.8. Futhermore, it
refactors the expression quite a lot:
* stumpwm has been moved from lisp modules to window-managers.
* stumpwm has been added to the window managers NixOS knows about, this
enables the user to add stumpwm as a default window manager in his
NixOS configuration like with Xmonad or i3.
* the package has been split into stumpwm and stumpwmContrib. This is
due to the fact that development of stumpwm and its extension modules
has been split into two repositories. As of today, the release is the
last one before this split. This split into two packages only reflect
those upcoming upstream changes already.
It is planned to make the addition of the extension modules voluntarily,
like with Xmonads option "enableContribAndExtras". Furthermore it might
be possible to add an option to compile stumpwm with clisp instead of
sbcl.
2014-10-05 14:50:08 +02:00
Eelco Dolstra
97220c973f
Replace hasAttr/getAttr calls with the ? and . operators
...
For NixOS evaluation, this gives a ~21% reduction in the number of
values allocated and a ~4% speedup. It's also more readable.
2014-10-05 01:11:06 +02:00
Austin Seipp
8cc3460a87
Merge pull request #4294 from daogames/tb/psql-port-fix
...
postgresql: use configured port when invoking psql
2014-10-01 18:56:39 -05:00
Rickard Nilsson
57721a2888
nixos: Add option services.cron.cronFiles
...
This allows you to configure extra files that should be appended to your
crontab. Implemented by writing to /etc/crontab when the cron service starts.
Would be nicer to use a cron that supports /etc/cron.d but that would require
us to patch vixie-cron.
2014-10-01 17:33:38 +02:00
Shea Levy
f5aaefbb6c
More pkgs.lib -> lib fixes
2014-09-29 09:45:59 -04:00
Vladimír Čunát
4bcae6dc96
merge #4265 : add KDE 4.14.1
2014-09-27 18:15:00 +02:00
Tino Breddin
eb7bbb4862
postgresql: use configured port when invoking psql
2014-09-27 14:37:11 +02:00
Jaka Hudoklin
ff8f23ab26
Merge pull request #4280 from wkennington/master.consul
...
nixos/consul: Add module
2014-09-27 07:00:39 +02:00
Attila Sztupak
90a326eecd
crashplan: nixos module for backup service
2014-09-26 15:33:36 +01:00
William A. Kennington III
36f9b9c284
nixos/consul: Add module
2014-09-26 03:25:14 -07:00
Matej Cotman
5e18182a30
mailpile: add module
2014-09-26 10:49:09 +02:00
ambrop7@gmail.com
bea503ec36
kde: Allow kde_next as a desktop environment
...
This is the same as
93fda9e353
2014-09-24 23:50:23 +02:00
Bjørn Forsman
3ebe3df4d0
nixos/samba: add services.samba.configText option
...
The .configText option is for providing verbatim content of smb.conf.
I'm adding this because I cannot seem to find any other way to override
(with mkForce) the generated smb.conf with the current samba module. All
attempts ends with errors ("duplicate entry samba/smb.conf").
2014-09-24 18:31:20 +02:00
Bjørn Forsman
753d9d4e4f
nixos/samba: remove services.samba.defaultShare option
...
It's not that difficult to define shares using standard samba config
file syntax, so why do we need the semi-configurable .defaultShare
option?
Also:
* It uses /home/smbd and I think /home should be reserved
for real human users.
* If enabled, it breaks the assumption that .extraConfig continues in
the [global] section.
Without .defaultShare there is no need for the "smbguest" user and group
either, mark them as unused.
2014-09-24 18:31:20 +02:00
Emery Hemingway
61f0d9b251
cjdns: update from 20140919 20140922
...
package installs to .../bin
fix service module to look in .../bin
Closes #4240
2014-09-23 22:30:53 +01:00