Simon Lackerbauer
1b55905806
gitlab: 10.3.4 -> 10.5.4
2018-03-22 02:29:28 +01:00
Robin Gloster
31d77fd4f3
gitlab-shell: fix config path finding
...
and remove TimeoutSec for gitlab
2018-03-22 02:29:27 +01:00
Robin Gloster
fa347164b6
graylog: use jre_headless
2018-03-22 02:29:27 +01:00
Dan Peebles
6fa9d9cdbd
hologram-server module: add cache timeout option
...
The version of hologram we're using has supported this option for a
while, but we didn't expose it through the NixOS module
2018-03-21 12:58:25 -04:00
Eelco Dolstra
7db841512a
Remove obsolete /nix/var/nix/{manifests,channel-cache}
2018-03-20 18:26:13 +01:00
Jörg Thalheim
35eddf5ef1
Merge pull request #37412 from volth/varnish456
...
varnish4: init at 4.1.9; varnish6: init at 6.0.0
2018-03-20 07:55:52 +00:00
Joel Thompson
fe2e4d6fb9
hologram: Enable configuring LDAP authorization
...
In AdRoll/hologram#62 support was added to hologram to configure
LDAP-based authorization of which roles a user was allowed to get
credentials for. This adds the ability to configure that.
Additionally, AdRoll/hologram/#94 added support to customize the LDAP
group query, so this also feeds that configuration through.
fixes #37393
2018-03-20 07:36:23 +00:00
volth
002b460822
varnish4: init at 4.1.9; varnish6: init at 6.0.0
2018-03-20 07:10:36 +00:00
Robert Schütz
c484079ac7
Merge pull request #36927 from dotlambda/borg-module
...
nixos/borgbackup: init
2018-03-19 20:30:32 +01:00
WilliButz
ca7b29050f
grafana: 5.0.2 -> 5.0.3, fix headless phantomjs
2018-03-19 19:59:10 +01:00
Robert Schütz
fdf0f037be
nixos/borgbackup: init
2018-03-19 13:12:47 +01:00
Peter Hoeg
2859483fe9
nixos home-assistant: a couple of fixes ( #36338 )
...
a) set path to /run/wrappers so ping works
b) run via a target so we can easily inject other components (config copier,
appdaemon)
2018-03-18 12:46:36 +01:00
Jörg Thalheim
5c1c4fbb06
Merge pull request #37084 from herrwiese/evilwm
...
nixos/window-managers: actually add evilwm to default.nix
2018-03-18 11:13:23 +00:00
Elis Hirwing
fa76c9a385
gitea: fix usage over ssh
...
Using gitea over ssh had two isses:
1. No shell was set for the user
2. Gitea tried to write logs to
/nix/store/x83q12kyd9gw1pay036dxz2dq0apf17h-gitea-1.3.2-bin/log when
serving the ssh usage.
2018-03-18 10:11:02 +01:00
Corey O'Connor
28a55f5bd6
jenkins: Add "java.awt.headless=true" to JDK options.
...
This is consistent with the recommended jenkins startup script. See:
* https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript
2018-03-17 22:16:59 -07:00
Corey O'Connor
241160aacc
jenkins: Include Deja-Vu fonts in system environment to silence jenkins warning.
2018-03-17 22:16:26 -07:00
Tuomas Tynkkynen
ef64208eba
Merge commit '3ab2949' from staging into master
...
Conflicts:
pkgs/development/compilers/llvm/6/llvm.nix
pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
Elis Hirwing
1ad75d0c50
gitea: enable and configure postgres service if selected as database
2018-03-15 18:34:54 +01:00
Andreas Wiese
c7e1dff94e
nixos/window-managers: actually add evilwm to default.nix
...
Commit 1f2b938
2018-03-15 10:22:53 +01:00
Tuomas Tynkkynen
2fec9c6e29
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +02:00
Silvan Mosberger
86ca617948
resilio: Adjust option description to 3d17573
2018-03-11 01:18:34 +01:00
Jan Malakhovski
7079e744d4
Merge branch 'master' into staging
...
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):
pkgs/development/libraries/epoxy/default.nix
pkgs/development/libraries/gtk+/3.x.nix
pkgs/development/python-modules/asgiref/default.nix
pkgs/development/python-modules/daphne/default.nix
pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Jörg Thalheim
196e21a160
nixos/tomcat: add types + proper systemd integration
...
fixes #35443
2018-03-08 09:09:42 +00:00
Benjamin Smith
024220bd7f
nixos/tomcat: add serverXml, environment files and log directories
...
* add serverXml verbatim override
* add environment file
* add log directory creation
2018-03-08 09:09:42 +00:00
Yegor Timoshenko
5905fe069b
tt-rss: use proper user and package for MySQL
2018-03-06 03:10:24 +00:00
volth
30877b1ed8
nix-serve: nix 2.0 fixes
2018-03-05 19:32:42 +00:00
Will Fancher
6b9a99e55d
LightDM: Set default user session when possible.
2018-03-04 23:54:09 +00:00
Vladimír Čunát
2069a2a002
Merge #35454 : nixos/pump.io: remove
2018-03-04 10:49:25 +01:00
Tuomas Tynkkynen
1e107443ad
Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging
2018-03-03 22:40:32 +02:00
Jörg Thalheim
6749f6e26e
Merge pull request #36249 from Ekleog/openldap-module-declarative-contents
...
Openldap module declarative contents
2018-03-03 19:00:13 +00:00
Vladimír Čunát
b70c93f211
Merge branch 'master' into nix-2.0
2018-03-03 18:02:35 +01:00
Jörg Thalheim
9936ed4920
Merge pull request #31019 from teto/strongswan_rebased
...
[RFC/RDY] make l2tp work with Strongswan
2018-03-03 15:56:05 +00:00
Léo Gaspard
aeef7c91f1
openldap module: allow defining contents declaratively
2018-03-03 15:33:23 +01:00
Léo Gaspard
cca9ec2a66
openldap module: cleanup
2018-03-03 15:33:01 +01:00
Jan Tojnar
618ac29687
cantarell-fonts: rename from cantarell_fonts
2018-03-03 00:36:38 +01:00
Bjørn Forsman
5de8f99f03
nixos/jenkins: ensure postStart follows redirects
...
Pass the -L flag to curl to make it follow redirects. This fixes an
issue I found when setting up reverse proxy for Jenkins. Without this
fix, the returned HTTP code was stuck at 302, making postStart fail the
service (it expects 200 or 403).
2018-03-02 08:48:38 +01:00
Shea Levy
95579af5ec
Merge remote-tracking branch 'origin/staging' into cross-nixos
2018-03-01 14:56:58 -05:00
Shea Levy
fec543436d
nixos: Move uses of stdenv.shell to runtimeShell.
2018-03-01 14:38:53 -05:00
Frederik Rietdijk
810dd0f984
Merge remote-tracking branch 'upstream/master' into HEAD
2018-03-01 20:00:42 +01:00
WilliButz
5ea2c87464
grafana: 4.6.3 -> 5.0.0
2018-03-01 17:50:09 +01:00
lejonet
565f22d27a
nixos/ceph: init module ( #35299 )
...
All 5 daemon types can be enabled and configured through the module and the module both creates the ceph.conf required but also creates and enables specific services for each daemon, based on the systemd service files that upstream provides.
2018-03-01 11:47:13 +00:00
Tuomas Tynkkynen
b8b2225f6b
Merge remote-tracking branch 'upstream/master' into staging
2018-03-01 06:09:20 +02:00
Shea Levy
4d5be58a8f
Merge remote-tracking branch 'origin/master' into cross-nixos
2018-02-28 17:07:13 -05:00
Shea Levy
5ff15fbf7d
Merge branch 'nix-ssh-ng'
2018-02-28 17:04:19 -05:00
Shea Levy
4de72b90f3
nixos: nix.sshServe: Support ssh-ng.
2018-02-28 16:55:00 -05:00
Frederik Rietdijk
cf0c20e0de
Merge pull request #35892 from Nadrieril/update-usbguard
...
usbguard: 0.7.0 -> 0.7.2
2018-02-28 20:30:30 +00:00
Sander van der Burg
8fbfd67f1f
disnix module: make dbus service configurable
2018-02-28 21:29:24 +01:00
Shea Levy
c0e814a434
nixos: udev: Generate hwdb with build-native udevadm.
2018-02-28 15:01:31 -05:00
Eelco Dolstra
212dd84dd2
Cleanup
2018-02-27 20:03:12 +01:00
Nadrieril
297fac40ca
nixos/usbguard: Do not check permissions on rules file (using undocumented -P flag)
2018-02-27 18:34:02 +00:00
