1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-22 21:15:03 -04:00
Commit graph

287 commits

Author SHA1 Message Date
Bjørn Forsman 419a4166a7 nixos/haproxy: small cleanup
* Add option types
* Rewrite option descriptions
* /var/run/haproxy.pid => /run/haproxy.pid (canonical location)
2015-02-22 12:29:34 +01:00
aszlig 030895f075
nixos/dhcpcd: Only run resume commands if enabled.
The networkd implementation sets systemd.services.dhcpcd.enable to
false in nixos/modules/tasks/network-interfaces-systemd.nix. So we need
to respect that in the dhcpcd module.

If we don't, the resumeCommand is set nevertheless, which causes the
post-resume.service to fail after resuming:

Failed to reload dhcpcd.service: Unit dhcpcd.service is masked.
post-resume.service: main process exited, code=exited, status=1/FAILURE
Failed to start Post-Resume Actions.
Dependency failed for Post-Resume Actions.
Unit post-resume.service entered failed state.
post-resume.service failed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-02-22 08:09:04 +01:00
Sou Bunnbu f8dbd6f9ae Merge pull request #6427 from grwlf/vsftpd-port
vsftpd.nix: add 'portPromiscuous' option
2015-02-18 19:18:34 +08:00
Sergey Mironov ac65a757f0 vsftpd.nix: add 'portPromiscuous' option 2015-02-18 11:51:43 +03:00
Mathijs Kwik 2fe44b95d0 nixos/wpa_supplicant: fix conflicting documentation
fixes #6298
2015-02-17 22:16:20 +01:00
James Cook 33550b6efe Merge pull request #5665 from joachifm/dnscrypt-proxy-apparmor-updates
dnscrypt-proxy service: update AppArmor profile
2015-02-14 22:02:31 -08:00
lethalman 51a7277fac Merge pull request #6312 from k0ral/sslh
sslh: added libwrap support + improved nixos module.
2015-02-13 10:03:48 +01:00
Jaka Hudoklin a17f5c8c9b nixos/consul: add consul-alerts service 2015-02-12 19:16:50 +01:00
koral cb153cfca3 sslh: added libwrap support + improved nixos module. 2015-02-12 13:21:36 +01:00
lethalman 93ebaafabe Merge pull request #6170 from k0ral/sslh
New sslh module
2015-02-10 11:17:56 +01:00
William A. Kennington III 9792b12e53 nixos/openntpd: Don't start until we have networking
This attempts to fix an issues where ntp is unable to resolve hostnames
because it came up before local nameservers or networking.
2015-02-06 14:45:47 -08:00
William A. Kennington III 3e280f2089 nixos/tinc: Fix key generation behavior and use tinc 1.1 by default 2015-02-05 23:37:20 -08:00
koral 1439e72147 New sslh module. 2015-02-05 13:30:39 +01:00
Edward Tjörnhammar 83925c33f6 i2pd: 0.6.0 -> 0.7.0
nixos: i2pd.service, fix string escaping
2015-02-05 12:09:59 +01:00
William A. Kennington III 9ddb6c9cc9 nixos/tinc: Add daemon configuration 2015-02-04 18:19:04 -08:00
William A. Kennington III bae5faa82d nixos/dhcpd: Also try restarting openntpd as it suffers the same dns resolution problem 2015-02-04 17:33:14 -08:00
William A. Kennington III 43d8b1ef3c openntpd: Fixes 2015-02-04 17:30:22 -08:00
William A. Kennington III a9f1329d2d nixos/openntpd: Add openntpd to the environment for ntpctl 2015-02-04 17:27:03 -08:00
lethalman 49b67bb9cb Merge pull request #6078 from boothead/sabnzbd
sabnzbd Change service to systemd
2015-02-03 13:32:59 +01:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Bjørn Forsman ee52a61e3a nixos/tftpd: add option types and fixup descriptions
The first description is a (incorrect) copy/paste from the 'vsftpd'
module, and the second option lacks a 'dot' at the end.
2015-02-01 15:57:28 +01:00
Shea Levy 52d4b9d982 Merge branch 'tlsdate' of git://github.com/4z3/nixpkgs 2015-01-30 01:07:59 -05:00
Eelco Dolstra b61d4ac6a5 ntpd: Fork into the background
With -n, ntpd will write log messages to both syslog and stderr, which
is ugly.
2015-01-28 15:34:42 +01:00
Eelco Dolstra 11a0344e13 Merge pull request #5918 from robberer/openntpd
openntpd: add extraConfig and extraOptions
2015-01-23 16:43:15 +01:00
Longrin Wischnewski 4fa5d1f626 openntpd: add extraConfig and extraOptions 2015-01-23 16:15:20 +01:00
tv 3fdd925063 nixos: Add tlsdated service 2015-01-21 05:09:47 +01:00
Joachim Fasting 7023e03d77 firewall service: fix pingLimit example value
The example uses single dashes, whereas iptables requires double dashes.
2015-01-20 08:47:11 +01:00
Peter Simons ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
William A. Kennington III 130f66b683 nixos/sync-server: Respect the enable option 2015-01-18 14:21:40 -08:00
Domen Kožar 3b174a4024 Merge pull request #5301 from nbp/syncserver
Add Firefox Sync service
2015-01-18 17:47:51 +01:00
Nicolas B. Pierron 8196727fad Improve the documentation of the syncserver module. 2015-01-18 12:21:23 +01:00
Nicolas B. Pierron 0d13ea0131 Change default syncserver listen.port to a safer one. 2015-01-18 12:20:44 +01:00
Eric Seidel 88eae46455 rename occurrences of gcc.gcc to gcc.cc 2015-01-14 20:47:49 -08:00
Edward Tjörnhammar 837cfbb9ea nixos: adding nylon service with uid,gid 2015-01-14 22:08:47 +01:00
Vladimír Čunát 72d2d59cd4 /etc/ssh/ssh_known_hosts: refactor and fix #5612
Generating the file was refactored to be completely in nix.
Functionally it should create the same content as before,
only adding the newlines.

CC recent updaters: @aszlig, @rickynils.
2015-01-11 22:14:25 +01:00
Joachim Fasting 97bac259d0 dnscrypt-proxy service: update AppArmor profile
This patch fixes the AppArmor profile path clause and adds
(currently ignored) network rules.

The AppArmor profile used to be defined for the path sbin/dnscrypt-proxy,
but the real path is bin/dnscrypt-proxy (due to sbin now being a symlink
to bin), which permitted the service to run unconfined.

Adding the network rules has no effect other than improving correctness,
as the version of AppArmor in the NixOS kernel fails to enforce network
rules.
2015-01-09 15:08:07 +01:00
William A. Kennington III 9a7766e054 nixos/network-interfaces: Add mstpd support for bridges 2015-01-07 14:49:24 -08:00
William A. Kennington III 8627110091 icedtea: Make major version nonspecific attrs 2015-01-02 00:24:49 -08:00
Tobias Geerinckx-Rice c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Domen Kožar 43af22b2de Merge pull request #5487 from luke-clifton/lc-btsync-group
btsync groups
2014-12-28 20:25:13 +01:00
Eelco Dolstra ea9d391bb5 Fix ntpd
Since the 4.2.8 upgrade, ntpd is broken on NixOS:

  Dec 28 19:06:54 hagbard ntpd[27723]: giving up resolving host 1.nixos.pool.ntp.org: Servname not supported for ai_socktype (-8)

This appears to be because DNS resolution doesn't work in chroots
anymore (due to /etc being missing). So disable chroots for now. It's
probably better to use systemd's containment facilities anyway.
2014-12-28 19:38:45 +01:00
Vladimír Čunát 61d9f06760 fix a typo from 2627198b0c 2014-12-28 10:44:50 +01:00
Luke Clifton 0c477eb38f Documentation update 2014-12-28 17:26:59 +08:00
Luke Clifton 61ff1b2b0a Moved UMask to correct location 2014-12-28 16:44:27 +08:00
Luke Clifton 5fdd6f6a66 Change umask 2014-12-28 16:39:56 +08:00
William A. Kennington III 2627198b0c nixos/firewall: Add ipset utility 2014-12-28 00:04:49 -08:00
Luke Clifton 5866a9df03 added group 2014-12-28 13:23:10 +08:00
Luke Clifton fabcc2cf7b Added btsync group to btsync user 2014-12-28 13:17:37 +08:00
Domen Kožar ec5fcfa82c network-manager: specify full path to sytemctl binary
(cherry picked from commit af8f76c256)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-27 11:53:07 +01:00
Igor Pashev 2b91b9b594 Strongswan: updown script uses ip and iptables utilities 2014-12-22 20:20:52 +00:00