Commit Graph

8304 Commits

Author SHA1 Message Date
Ben Wolsieffer
ed6f1761cc grafana: support socket protocol 2018-04-12 22:49:15 -04:00
Austin Seipp
7413eb8b49 nixos/postgresql: remove ancient hack for postgres 8.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-04-11 12:25:11 -05:00
Yegor Timoshenko
9a9c38eee8
Merge pull request #38773 from bandresen/zfsAutoSnapshot
zfs.autoSnapshot: make `frequent` run every 15 mins
2018-04-11 14:58:51 +00:00
Benjamin Andresen
96f10e7e49 zfs.autoSnapshot: make frequent run every 15 mins
fixes bug that there is 30 minutes between hh:45 and hh:15 every hour.
2018-04-11 16:45:00 +02:00
Frederik Rietdijk
ee6894ca12 Merge staging into master 2018-04-11 14:55:52 +02:00
BjornMelgaard
46c270c5a6 safeeyes: restart only on failure 2018-04-10 21:19:13 +03:00
BjornMelgaard
2f4a220130 safeeyes: add module 2018-04-10 21:19:13 +03:00
Frederik Rietdijk
6023849ba1 Merge master into staging 2018-04-10 19:23:42 +02:00
Jörg Thalheim
d8647f96bd
Merge pull request #38643 from brainrape/prosody-add-dataDir
nixos/prosody: add dataDir option
2018-04-10 09:08:50 +01:00
Robert Schütz
80fc5f2a24 Merge branch 'master' into staging 2018-04-10 09:13:36 +02:00
Matthew Justin Bauer
07886aaf5a
Merge pull request #33794 from yrashk/onlykey
config.hardware.onlykey configuration option
2018-04-09 14:29:31 -05:00
Frederik Rietdijk
0aa59a08d6 Merge master into staging 2018-04-09 15:12:32 +02:00
Márton Boros
615fefb3a5 nixos/prosody: add dataDir option 2018-04-09 14:19:42 +02:00
Jörg Thalheim
41ec2c2223
Merge pull request #38362 from orbekk/acme-path
fix: nixos/nginx certificate location
2018-04-09 09:02:51 +01:00
Jörg Thalheim
e8cfda7f13 lxc: enable pam_cgfs and fix module
pam_cgfs was part in lxcfs before and moved here

fixes #37985
2018-04-09 08:15:00 +01:00
Jörg Thalheim
53611a9b6c
Merge pull request #38629 from ivanbrennan/less-configFile
nixos/less: add configFile option
2018-04-09 07:03:29 +01:00
Matthew Justin Bauer
1381606b8e
Merge pull request #38533 from nyanloutre/duplicati-package
duplicati: init at 2.0.3.3
2018-04-08 21:49:48 -05:00
ivanbrennan
6e4096d792 nixos/less: add configFile option
Expose the path to a lesskey file as a module option. This makes it
possible to maintain a single lesskey file, used for both NixOS and
non-nix systems. An example of how this can be done follows.

1. Write a derivation that fetches lesskey from a known location:

  { stdenv, fetchgit }:
  stdenv.mkDerivation {
    name = "foo";
    src = fetchgit { .. };
    phases = [ "unpackPhase" "installPhase" ];
    installPhase = "mkdir -p $out && cp $src/lesskey $out/lesskey";
  }

2. Set programs.less.configFile to the corresponding path:

    programs.less = {
      enable = true;
      configFile = "${pkgs.foo}/lesskey";
    };
2018-04-08 22:37:35 -04:00
Matthew Justin Bauer
9c66871784
Merge pull request #38094 from volth/patch-120
nixos/network-scripted: print error details
2018-04-08 21:27:38 -05:00
Jörg Thalheim
6fd1520e45
Merge pull request #38547 from Ma27/iftop-module
nixos/iftop: add module
2018-04-08 14:05:20 +01:00
aszlig
99ba1cb424
Increase max group name length to 32 characters
With #36556, a check was introduced to make sure the user and group
names do not exceed their respective maximum length. This is in part
because systemd also enforces that length, but only at runtime.

So in general it's a good idea to catch as much as we can during
evaluation time, however the maximum length of the group name was set to
16 characters according groupadd(8).

The maximum length of the group names however is a compile-time option
and even systemd allows more than 16 characters. In the mentioned pull
request (#36556) there was already a report that this has broken
evaluation for people out there.

I have also checked what other distributions are doing and they set the
length to either 31 characters or 32 characters, the latter being more
common.

Unfortunately there is a difference between the maximum length enforced
by the shadow package and systemd, both for user name lengths and group
name lengths. However, systemd enforces both length to have a maximum of
31 characters and I'm not sure if this is intended or just a off-by-one
error in systemd.

Nevertheless, I choose 32 characters simply to bring it in par with the
maximum user name length.

For the NixOS assertion however, I use a maximum length of 31 to make
sure that nobody accidentally creates services that contain group names
that systemd considers invalid because of a length of 32 characters.

Signed-off-by: aszlig <aszlig@nix.build>
Closes: #38548
Cc: @vcunat, @fpletz, @qknight
2018-04-08 12:51:33 +02:00
Frederik Rietdijk
595a72589f Merge master into staging 2018-04-08 10:54:17 +02:00
Wout Mertens
fc6ab8dfa7
google-compute-image: provide correct MTU 2018-04-08 08:46:42 +02:00
nyanloutre
b3aa9ecdf8
duplicati: create service 2018-04-07 21:23:04 +02:00
Maximilian Bosch
50a34e55b2
nixos/iftop: add module
This patch is heavily inspired by bd0d8ed807 which added
a setcap wrapper for `mtr` in order to allow running `mtr` without
`sudo`. The need for the capability `cap_net_raw` that can be registered using
`setcap` has been documented in the Arch Wiki: https://wiki.archlinux.org/index.php/Capabilities#iftop

A simple testcase has been added which starts two machines, one with a
setcap wrapper for `iftop`, one without. Both testcases monitor the
bandwidth usage of the machine using the options `-t -s 1` once, the
machine with setcap wrapper is expected to succeed, the `iftop` on the
machine without setcap wrapper is expected to return a non-zero exit
code.
2018-04-07 15:06:51 +02:00
Wout Mertens
d55e830982
Merge pull request #38527 from gnidorah/gitweb
nixos/nginx: fix gitweb submodule
2018-04-07 14:39:51 +02:00
gnidorah
073089914e nixos/nginx: fix gitweb submodule 2018-04-06 22:36:03 +03:00
Rob Vermaas
b894dd8b82
Update create-gce.sh script. Set default option for GCE images to disable host key replacement by service.
(cherry picked from commit 748d96ffa3c51c3127bcdf23a88d54afad6406e9)
2018-04-06 10:57:31 +02:00
Tim Engler
d488a9dc7a nixos/lxqt: enable upower if config.powerManagement is enabled (#38318) 2018-04-06 08:49:55 +01:00
Corey O'Connor
c0de2454bd nixos/transmission: Refactor out explicit listing of managed directories 2018-04-05 22:07:49 +02:00
Corey O'Connor
9eec034d75 nixos/transmission: refactor preStart into script 2018-04-05 22:07:49 +02:00
Jörg Thalheim
f55a6ab844
Merge pull request #38302 from johannesloetzsch/master
mate/mate-screensaver: fixed unixAuth
2018-04-05 21:02:18 +01:00
Frederik Rietdijk
a9f37d1c25 Merge master into staging 2018-04-05 19:25:05 +02:00
Rob Vermaas
ced3a201e3
gce: needs bigger diskSize
(cherry picked from commit ac3437aa061e80604d28aa3dd09013417f3193b1)
2018-04-05 12:19:05 +02:00
Rob Vermaas
0164c94a51
ec2-amis.nix: add 18.03 images
(cherry picked from commit e5a4fb31bded4b4e6a7952455f97850e2f013002)
2018-04-05 11:58:53 +02:00
Michael Raskin
b07ce1fb74
Merge pull request #38114 from oxij/nixos/doc-module
nixos: doc module
2018-04-05 07:09:32 +00:00
Michael Raskin
195521350a
Merge pull request #38111 from oxij/tree/cleanups
assorted cleanups
2018-04-05 07:08:05 +00:00
Franz Pletz
20ad4be383
Merge pull request #38405 from volth/patch-121
network-interfaces-scripted: wlanInterfaces have .device, …
2018-04-05 04:45:50 +00:00
Charles Strahan
5c066e2bba
Merge pull request #37218 from cstrahan/kube-test-fix
nixos: kubernetes fixes
2018-04-04 19:14:48 -04:00
Frederik Rietdijk
23741692fa Merge master into staging 2018-04-04 19:36:39 +02:00
Jörg Thalheim
b6ec6fd525
Merge pull request #38431 from volth/patch-122
network-interfaces.nix: dead code removal
2018-04-04 15:30:22 +01:00
Joachim Schiele
7be79f22f2
nixos/dhcp: fix permissions of statedir
nixos/dhcp: fix permissions of statedir
2018-04-04 16:26:25 +02:00
Graham Christensen
9b30d48b2b
Merge pull request #37288 from cleverca22/improve-make-tarball
make-system-tarball: allow alternate compression methods
2018-04-04 10:11:25 -04:00
volth
b9e01e64b7
network-interfaces.nix: dead code removal
`wlanDeviceUdevScript` is not used below in the text
2018-04-04 13:45:49 +00:00
Eelco Dolstra
0236a947d0
mkdir -> install -d
Fixes #38421.
2018-04-04 13:04:35 +02:00
nyanloutre
172ca5884b
transmission: settings doc location changed 2018-04-03 22:32:36 +02:00
volth
dd9f776509
network-interfaces-scripted: wlanInterfaces have .device, no "${dev}-netdev.service" 2018-04-03 20:00:12 +00:00
Michael Bishop
3c9e579d1e
make-system-tarball: allow alternate compression methods 2018-04-03 11:30:43 -03:00
Kjetil Ørbekk
8614e22297 fix: nixos/nginx certificate location
Fix issue when using a cert location other than the default.
2018-04-02 20:34:01 -04:00
Tuomas Tynkkynen
747ebe3f66 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/top-level/all-packages.nix
2018-04-03 02:22:54 +03:00