mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 23:52:33 +00:00
Code Issues Wiki Activity
88041 commits 232 branches 124 tags 7.3 GiB
Commit graph

4629 commits

Author SHA1 Message Date
Tristan Helmich 8c61b3af03 nginx: fixed duplicate http declaration 2016-07-28 11:59:13 +00:00
Robin Gloster 91680de317 nginx module: add statusPage option 2016-07-28 11:59:13 +00:00
Robin Gloster a294ad01b3 nginx module: make recommended settings optional 2016-07-28 11:59:13 +00:00
Robin Gloster 186a8400ed nginx module: make httpConfig backward compatible 2016-07-28 11:59:13 +00:00
Robin Gloster 5dd7cf964a nginx module: improve documentation 2016-07-28 11:59:13 +00:00
Franz Pletz de8008a1b1 nginx module: Enable http2 2016-07-28 11:59:13 +00:00
Franz Pletz e982aeae6a nginx module: Add default proxy headers for tomcat 2016-07-28 11:59:13 +00:00
Robin Gloster 3830a890ab nginx module: add option to make vhost default 2016-07-28 11:59:13 +00:00
Robin Gloster 138945500e nginx module: implement basic auth 2016-07-28 11:59:13 +00:00
Robin Gloster ff12ee35b7 nginx module: redirect to same protocol 2016-07-28 11:59:13 +00:00
Robin Gloster e18f8e8b66 nginx module: turn off basic auth on acme locations 2016-07-28 11:59:13 +00:00
Franz Pletz 4e5c7913e9 nginx module: Add acmeFallbackHost vhost option 2016-07-28 11:59:13 +00:00
Franz Pletz 811f243ce6 nginx module: Add extraConfig for locations 2016-07-28 11:59:13 +00:00
Franz Pletz d5a097fdb6 nginx module: Don't create acme certs if acme is not enabled 2016-07-28 11:59:13 +00:00
Tristan Helmich c61157b7e6 nginx module: Add dhParams option 2016-07-28 11:59:13 +00:00
Tristan Helmich 35d76a72ab nginx module: Add sslCiphers option 2016-07-28 11:59:13 +00:00
Tristan Helmich 8bd1f401bb nginx module: Add sslProtocols option 2016-07-28 11:59:13 +00:00
Tristan Helmich 900b311a38 nginx module: Fix ACME extraDomains, fix challenge url to not redirect to allow renewals 2016-07-28 11:59:13 +00:00
Tristan Helmich 4676983990 nginx module: Add ACME support for ssl sites 2016-07-28 11:59:13 +00:00
Robin Gloster f298be9ef4 nginx module: declarative config 2016-07-28 11:58:37 +00:00
Robin Gloster 356c2fe00d Revert "nginx: Verify that configuration is syntactically correct" (#17337) 2016-07-28 13:55:06 +02:00
Peter Hoeg 62f2f72e98 tmux module: do not override keys by default in VI mode (#17330) 
We want to stick to upstream defaults as much as possible.

As pointed out by @8573 in #16999, this was not the case.
 2016-07-28 13:10:42 +02:00
Peter Hoeg 65ef5d8f5b rspam module: use mkEnableOption 
See #17329.
 2016-07-28 07:06:35 +02:00
Franz Pletz 8a1e7cd556 rspamd service: fix runtime directory, log to syslog 
Fixes #17144.
 2016-07-28 06:22:29 +02:00
Franz Pletz d23521b16c rmilter service: use runtime dirctory for socket 2016-07-28 06:22:23 +02:00
Robin Lambertz b65e9d87e2 matrix-synapse: Only run StartPre script when data folder doesn't exist (#17216) 2016-07-28 04:13:21 +02:00
Franz Pletz 996c9837fa Merge pull request #17322 from RamKromberg/init/motif 
motif: init at 2.3.6 & nedit: 5.6 -> 5.6a
 2016-07-28 03:53:38 +02:00
Ram Kromberg 3800bb5017 motif: init at 2.3.6 2016-07-28 01:33:45 +03:00
Bjørn Forsman c7860cae1a Revert "phpfpm service: restructured pool configuration" 
This reverts commit 6b3f5b5a42 because it
introduced a non-backwards compatible change in the phpfpm interface,
without really needing to. The new interface, if needed, can be re-added
alongside the old interface.

Commit 98e419c0e2 ("tt-rss service: init at 16.3")
depends on the new interface, so this commit updates the tt-rss service
to work with the old services.phpfpm.poolConfigs interface.
 2016-07-27 23:53:58 +02:00
Robin Lambertz 103805dec5 nginx: Verify that configuration is syntactically correct (#17208) 2016-07-27 22:24:08 +02:00
Shawn Warren 7234275cd5 bump gocd-server version to 16.6.0-3590 (#17304) 
Update gocd-server package version to 16.6.0-3590 including new sha.  Modify heapSize
and maxMemory mkOption to accurately reflect their intended purpose of configuring
initial java heap sizes.
 2016-07-27 18:44:28 +02:00
Rok Garbas 14e8071921 Merge pull request #17305 from hiberno/update-elk-stack 
Update elk stack
 2016-07-27 18:42:08 +02:00
Christian Lask 6d68a1fbf3 logstash: 1.5.3 -> 2.3.4 
Note: the option to configure the watchdog timeout seems to be gone
in the 2.3 series of Logstash. It complains about an unknown option
and it is not in the source anymore. I am thus removing this
configuration option to adjust the service to these changes, too.
 2016-07-27 17:45:38 +02:00
Tristan Helmich c9b9692347 tinc: add Restart in systemd service config 2016-07-27 10:38:57 +02:00
Joachim F ad127bb55d Merge pull request #17271 from jokogr/fix/syncthing-system-service 
syncthing: fix system service
 2016-07-27 03:23:08 +02:00
Bjørn Forsman 0a2174f195 nixos/lighttpd: move cgit setup to cgit.nix 
To where it really belongs. Separation of concern.
 2016-07-26 15:37:24 +02:00
Ioannis Koutras 24968fc1c1 syncthing: fix system service 2016-07-26 13:10:15 +03:00
Wout Mertens 62d11a6961 Merge pull request #17206 from nathan-gs/patch-2 
Fix #9759 SSMTP sendmail wrapper
 2016-07-26 10:52:19 +02:00
Wout Mertens 3bb18c68d2 Merge pull request #17042 from rasendubi/etc 
etc: remove obsolete directories
 2016-07-26 09:04:10 +02:00
Luca Bruno 5c738ec37e gnome3: drop 3.18 2016-07-25 22:49:12 +02:00
Alexey Shmalko fe9cabedf0
etc: remove obsolete directories 
This patch adds handling of a directory becoming a symlink in
/etc. Before this patch, the directory wasn't removed and then
symlinking failed, which caused directory not being updated at all.

The idea for the patch goes to @abbradar at
https://github.com/NixOS/nixpkgs/issues/16978#issuecomment-232921903:
> A heuristic idea for this -- a function `isStatic :: Path -> Bool`:
>
> * if path `/etc/foo` is a file, return True iff it's a symlink to `/etc/static/foo`.
> * if path is a directory, return True iff for all items in it `isStatic` is True.
>
> On any conflicts, if old path is static, it's safe to replace and/or
> delete stale. Otherwise make a backup and notify the user via a
> journal entry and console output.

The only difference here -- it will not replace user configs.

This also fixes https://github.com/NixOS/nixpkgs/issues/16978.
 2016-07-25 15:50:53 +03:00
Joachim F 0050338610 Merge pull request #17087 from j1r1k/pulseaudio-extraClientConf 
pulseaudio module: add extraClientConf option
 2016-07-24 15:52:01 +02:00
Nikolay Amiantov ddb75882b6 kbd task: fix colors in early initrd 2016-07-24 15:08:49 +03:00
Joachim Fasting 96542a1b00
grsecurity module: assert RBAC support in kernel 2016-07-24 12:54:07 +02:00
Joachim Fasting 5ece58ed66
grsecurity module: add gradm to system path 2016-07-24 12:54:07 +02:00
Benno Fünfstück 1e534e234b fix nixos-version --hash when building from git 2016-07-23 22:59:03 +02:00
Emery Hemingway 90ee01cd3d nixos: disable DHCP on ZeroTier interfaces 2016-07-23 21:04:42 +02:00
Nathan Bijnens bb528e714d Fix #9759 SSMTP sendmail wrapper - cfg instead of full path 2016-07-23 20:58:58 +02:00
Nathan Bijnens cf3867a5ef Fix #9759 SSMTP sendmail wrapper 2016-07-23 18:00:10 +02:00
ben smith c38e6a2a60 mysql: fix replication tests (#17174) 
Eliminate race condition in replication test
Remove replication configuration from standalone test
Improve mysql command syntax consistency
 2016-07-23 00:37:05 +02:00
Shawn Warren 9886c80daa Add gocd agent and server service packages (#16273) 
GoCD is an open source continuous delivery server specializing in advanced workflow
modeling and visualization.  Update maintainers list to include swarren83.  Update
module list to include gocd agent and server module.  Update packages list to include
gocd agent and server package.  Update version, revision and checksum for GoCD
release 16.5.0.
 2016-07-23 00:29:18 +02:00
Moritz Ulrich f8ea8c7197 tt-rss: Fix evaluation by disabling nginx-options. 
The nginx.virtualHosts option isn't merged yet. We can re-enable these
features when https://github.com/NixOS/nixpkgs/pull/15862 is merged.
 2016-07-22 09:54:25 +02:00
Rok Garbas d73c115aa4 Merge pull request #16132 from zohl/tt-rss 
tt-rss service: init at 16.3
 2016-07-21 20:48:18 +02:00
Al Zohali 98e419c0e2 tt-rss service: init at 16.3 2016-07-21 20:46:35 +03:00
Michele Guerini Rocco 267e362fbc syncthing: Allow the user service to be enabled with systemctl (#17136) 2016-07-21 04:49:58 +02:00
ben smith e641974f06 MySQL Replication (that actually works) (#7198) 
Improves replication functionality by:
 * adding slaveHost on the 'master' role
 * adds slave user to master with replication only permissions
 2016-07-21 02:15:55 +02:00
Rok Garbas db7b4fb073 Merge pull request #6846 from wizeman/u/zfs-auto-snap-flags 
nixos: ZFS auto-snapshot improvements
 2016-07-21 01:53:11 +02:00
davidak 83bdc8e858 caddy service: add options to change ACME certificate authority (#16969) 
and agree to let's encrypt subscriber agreement
 2016-07-21 01:51:09 +02:00
cransom 4a9b640f37 smokeping: init at 2.6.11 (#17090) 
Includes a module for service setup and a test
to verify functionality of both service and pkg.
 2016-07-21 01:07:59 +02:00
Rok Garbas 760da3e3f3 nixos: init programs.xonsh 2016-07-21 00:55:36 +02:00
Nikolay Amiantov 3cc54bbad9 Merge pull request #17082 from abbradar/fix-early-kbd 
Use new early kbd-setting code in initrd and fix layouts from external packages
 2016-07-20 23:52:45 +04:00
Bjørn Forsman 78eac466b0 nixos/ddclient: add warning about password being world readable 
Closes #16885.
 2016-07-19 16:51:42 +02:00
Matthew Justin Bauer 802a700373 virtualbox: fix virtualbox guest additions (#16964) 2016-07-19 13:55:44 +02:00
Svein Ove Aas 9a8e0d1c2e zfs: Force sync on shutdown (#16903) 2016-07-19 09:57:13 +02:00
Christian Kauhaus 3530f3f20a systemd: make ctrl-alt-del target configurable. (#16911) 
We currently only allow upstream's default of "reboot.target" due to the
way the symlinks are initialized. I made this configurable similar to the
default unit.
 2016-07-19 09:42:53 +02:00
Eric Merritt eb92804f91 nixos-containers: init package (#16959) 
This moves nixos-containers into its own package so that it can be
relied upon by other packages/systems. This should make development
using dynamic containers much easier.
 2016-07-19 08:13:06 +02:00
Nikolay Amiantov 399db54e35 nixos/qemu: don't recreate extra disks 2016-07-19 05:20:02 +03:00
Franz Pletz febcd39afa nixos/grafana: set plugins path, fix image generation 
Also add options to configure which organization should have anonymous access.
 2016-07-19 00:18:12 +02:00
Jiri Marsicek 7d0990b594 pulseaudio module: add extraClientConf option 2016-07-19 00:14:58 +02:00
Nikolay Amiantov cf64a7ecc0 kbd module: fix keymaps search for loadkeys 2016-07-18 23:46:38 +03:00
Nikolay Amiantov 7bed3d0cb3 nixos stage-1: move keymap handling to kbd module 2016-07-18 23:27:45 +03:00
Nikolay Amiantov 6f89369440 libinput service: add libinput to udev packages 
See #17054
 2016-07-18 17:14:34 +03:00
Nikolay Amiantov 3d69653d6b plymouth service: stop splash screen before a failure prompt 2016-07-18 13:45:37 +03:00
Nikolay Amiantov 7513a1d2f5 plymouth service: update root fs before stage 2 2016-07-18 13:45:37 +03:00
Nikolay Amiantov 9cab592abd plymouth service: style fixes 2016-07-18 13:45:37 +03:00
Nikolay Amiantov 86ad25625f nixos stage-1: add custom pre failure dialog commands 2016-07-18 13:45:37 +03:00
Benno Fünfstück 336786addc nixos/lightdm: support greeter-less auto login 
This adds configuration options for automatic login and disabling the
greeter (this should avoid the dependency on gtk).
 2016-07-17 18:54:23 +02:00
Benno Fünfstück 8881f940a9 nixos/sddm: options documentation improvements 2016-07-17 18:54:23 +02:00
Benno Fünfstück be625ad36b xsession: fix multiple arguments with logToJournal 
KDM and LightDM (at least with autologin) call the xsession-script with
two arguments: the first is the path of the xsession script itself,
while the second one are the actual arguments. The line to re-exec the
script under systemd-cat only forwarded a single argument, therefore
breaking LightDM and KDM login. This commit fixes the issue by always
forwarding all the arguments.
 2016-07-17 18:54:23 +02:00
Nikolay Amiantov 193ab8be67 Revert "nixos stage-1: try to quit plymouth if started on failure" 
This reverts commit c69c76ca7e.

This patch was messed up during a rebase -- the commit title doesn't match what
it really does at all (it is actually a broken attempt to get LUKS passphrase
prompts in Plymouth).
 2016-07-17 15:03:13 +03:00
Michele Guerini Rocco 47f59a51e4 nixos/compton: add user service (#16652) 2016-07-17 02:25:38 +02:00
Frederik Rietdijk 24fdb7ce21 Merge pull request #16889 from grahamc/sysstat 
sysstat: Create systemd service for historical sar data
 2016-07-16 19:29:13 +02:00
Thomas Tuegel b2cf5aabb0 nixos/kde5: add missing Plasma packages 2016-07-16 10:14:50 -05:00
Thomas Tuegel 32c1f05aed nixos/kde5: install missing frameworks 2016-07-16 10:14:48 -05:00
Thomas Tuegel d3747a2261 kinit: use a setuid wrapper for start_kdeinit 2016-07-16 10:14:47 -05:00
Thomas Tuegel 888c66f97d nixos/kde5: disable setuid wrapper for kdeinit 
We need to pass certain environment variables through the wrapper, but I
don't know how to do that yet. The setuid-root feature serves only to
hide kdeinit from the OOM killer, so this is not critical.
 2016-07-16 10:14:46 -05:00
Thomas Tuegel 1cb4aacf18 nixos/kde5: fix paths to setuid programs 2016-07-16 10:14:45 -05:00
Joachim F ed50ef318b Merge pull request #15848 from matthewbauer/packagekit 
Add in PackageKit
 2016-07-16 13:29:08 +02:00
Joachim F 8f43f111c0 Merge pull request #15840 from anderspapitto/pulse-jack 
pulseaudio service: set DISPLAY
 2016-07-16 13:26:39 +02:00
Joachim F 86ba20b3d8 Merge pull request #16686 from AndersonTorres/pekwm 
pekwm: init at 0.1.17
 2016-07-16 13:19:00 +02:00
Joachim Fasting 59c9a88a6b
grsecurity module: tweak lockTunables option description 2016-07-16 11:11:35 +02:00
Joachim Fasting cef7150bc7
grsecurity module: grsecurity is not capitalized mid-sentence 2016-07-16 11:11:35 +02:00
Joachim Fasting 94824303be
grsecurity module: smarter container support 
Only set tunables required for container support if there are any containers.
 2016-07-16 11:11:35 +02:00
Joachim Fasting c606b9876f
grsecurity module: enforce size overflows by default 
It is better to make this conditional on whether the configuration contains a
known size overflow that could prevent the system from booting.
 2016-07-16 11:11:35 +02:00
obadz cfc0a5415b Revert "fontconfig: fix etc priority" 
This reverts commit 1e53d4a777.

Closes #16983

cc @vcunat @ericsagnes @dezgeg
 2016-07-15 20:44:21 +02:00
Robin Gloster 0749876016 Merge pull request #15957 from mayflower/sonarr_upstream 
sonarr: init at 2.0.0.4146 + sonarr service
 2016-07-15 17:34:18 +02:00
Bjørn Forsman 8c2d888401 jenkins: move $out/{lib => webapps}/jenkins.war 
As pointed out by @danbst, the tomcat NixOS module expects packages
listed in services.tomcat.webapps to either be direct .war file paths or
have .war files inside a "webapps" directory.

Commit 4075c10a59
("jenkins: move .war file from $out to $out/lib/jenkins.war") broke
jenkins + tomcat. Fix it by moving jenkins.war to $out/webapps/.
 2016-07-15 17:18:44 +02:00
Tristan Helmich ed466b7fef sonarr service: initial service 2016-07-15 16:18:37 +02:00
Bjørn Forsman 4075c10a59 jenkins: move .war file from $out to $out/lib/jenkins.war 
Fixes #14137, also known as:

  $ nix-shell -p jenkins
  bash: source: /nix/store/ln1yw6c2v8bb2cjqfr1z5aqcssw054wa-jenkins-2.3:
  cannot execute binary file
  [nix-shell exited with error]

The problem is that jenkins.war is not installed inside the directory
$out, but rather _as the file_ $out. Fix it by moving the file to
$out/lib/jenkins.war.

While at it, move buildCommand so that the "meta" section is at the end
of the expression (standard style), and quote shell variables.
 2016-07-15 15:12:52 +02:00
Frederik Rietdijk cfb4a19f51 Merge pull request #16967 from davidak/caddy-fix 
caddy service: fix nix store output path
 2016-07-15 12:26:18 +02:00