Eelco Dolstra
91ec6e0d90
Merge remote-tracking branch 'origin/master' into staging
2014-09-18 22:28:35 +02:00
Eelco Dolstra
0de982d75b
httpd: Add option for specifying robots.txt
2014-09-18 19:05:26 +02:00
Eelco Dolstra
837a0c05e5
httpd: Don't emit robots.txt if there are no robots entries
2014-09-18 18:48:28 +02:00
Eelco Dolstra
ec4f38c56f
Manual: Remove some option defaults that refer to store paths
...
Option defaults should not refer to store paths, because they cause
the manual to be rebuilt gratuitously. It's especially bad to refer to
a highly variable path like a computed configuration file.
2014-09-18 16:21:26 +02:00
Rickard Nilsson
8fc777ffd6
syslog-ng module: Add package option
2014-09-17 19:48:51 +02:00
Jaka Hudoklin
9c3c7a75d3
collectd: add pidFile option, change default pid to /var/run/collectd.pid
2014-09-17 19:21:05 +02:00
Jaka Hudoklin
1cdb6cfb00
nixos/graphite: add package option to graphiteApi
2014-09-17 18:33:51 +02:00
Jaka Hudoklin
75aaeca9d2
nixos/graphite: add seyren service, graphite alerting dashboard
2014-09-17 18:33:50 +02:00
Jaka Hudoklin
c396ee9912
nixos: add collectd module
2014-09-17 18:33:50 +02:00
William A. Kennington III
ec9c4143a7
nixos/firewall: Cleanup in case reload fails
2014-09-16 15:51:57 -07:00
lethalman
3224b32e64
Merge pull request #4101 from ts468/e19
...
Add package: Enlightenment E19!!!!
2014-09-16 16:13:56 +02:00
Rickard Nilsson
66bbbc205d
nixos/nfs: Fix configuration merge
2014-09-16 13:53:18 +02:00
Jaka Hudoklin
9bd66b24d9
nixos/graphiteApi: add example config for influxdb backend
2014-09-16 10:41:56 +02:00
Jaka Hudoklin
996da030b6
nixos/mongodb: service fixes
...
- Log to syslog, so journal picks-up logs
- Start as foring service, so systemd will wait for service to start
- Add extraConfig option
2014-09-16 10:28:04 +02:00
Jaka Hudoklin
271e0f7488
nixos/graphite: add host and port options for graphiteApi
2014-09-16 10:28:04 +02:00
William A. Kennington III
1321fd175d
nixos/nat: Leverage firewall module
2014-09-15 21:31:27 -07:00
William A. Kennington III
6a43d51291
nixos/firewall: Support extraStopCommands
2014-09-15 21:31:26 -07:00
William A. Kennington III
43c2bc0f8c
Merge pull request #4108 from wkennington/master.firewall
...
Firewall: Don't allow traffic during nixos-switch / reload
2014-09-15 20:42:40 -07:00
William A. Kennington III
fd7b9b4291
nixos/firewall: Don't allow traffic during reload
2014-09-15 20:40:16 -07:00
William A. Kennington III
4d193b7262
systemd: Support reload scripts
2014-09-15 20:04:49 -07:00
Thomas Strobel
1613d6cca6
Add package: Enlightenment E19!
...
Wayland desktop shell is not enabled, yet.
2014-09-15 23:34:28 +02:00
Bjørn Forsman
0bfd27535f
nixos/libvirtd: refresh LXC emulator path on startup
...
This fixes the issue when the LXC emulator binary is garbage collected
and breaks libvirtd containers, because libvirtd XML file still refers
to GC'ed store path.
We already have a fix for QEMU, this commit extends the fix to cover LXC
too.
2014-09-15 23:03:20 +02:00
Michael Raskin
d05684be21
Merge pull request #3694 from matejc/cmst
...
new package: cmst - qt gui for connman
2014-09-15 23:12:01 +04:00
Aristid Breitkreuz
69c95e3fdf
Merge pull request #4041 from nbp/disable-fuppes
...
Disable fuppes module
2014-09-14 22:29:30 +02:00
Vladimír Čunát
d957b4bd78
Merge recent master into staging
...
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +02:00
Jaka Hudoklin
d6f9878fbf
nixos/elasticsearch: wait for start
2014-09-13 02:21:31 +02:00
Jaka Hudoklin
f7ba3d833f
nixos/znc: fix module, createUser option does not exist anymore
2014-09-13 02:20:32 +02:00
Jaka Hudoklin
74122464da
nixos/influxdb: wait for start
2014-09-13 02:19:39 +02:00
Jaka Hudoklin
26fd945151
nixos/rabbitmq: wait for start
2014-09-13 02:16:53 +02:00
Jaka Hudoklin
a23e4997d3
Merge pull request #4034 from offlinehacker/graphiteApi
...
nixos: add graphite api to graphite functionality
2014-09-13 00:05:36 +00:00
Bjørn Forsman
ec59929c9f
nixos/jekins: add services.jenkins.extraGroups option
...
This makes it easy to give jenkins extra privileges by adding group
memberships. Use with care :-)
2014-09-12 15:25:15 +02:00
Matej Cotman
99a46a0eca
set network manager as default true
2014-09-12 13:52:26 +02:00
William A. Kennington III
bab5efd237
nixos/ssh: Allow user to configure the package that provides ssh/sshd
2014-09-11 22:07:39 -07:00
Nicolas B. Pierron
ca02c60cb8
Disable fuppes module
...
fuppes has not been compiling for a long moment, and the ffmpeg version on
which it depends is no longer listed in nixpkgs.
2014-09-11 23:46:20 +02:00
Bjørn Forsman
a44de69d06
nixos/tomcat: make package version configurable
2014-09-11 22:32:16 +02:00
aszlig
d394d095ab
containers: Don't descend into mounts on destroy.
...
This tells the sad tale of @the-kenny who had bind-mounted his home
directory into a container. After doing `nixos-container destroy` he
discovered that his home directory went from "full of precious data" to
"no more data".
We want to avoid having similar sad tales in the future, so this now also
check this in the containers VM test.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-11 18:12:35 +02:00
aszlig
859f049d1b
containers: Remove check for var/lib/startup-done.
...
Fixes a leftover from 330fadb706
.
We're using systemd dbus notifications now and this leftover caused the
startup notification to fail.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-11 18:12:35 +02:00
Jaka Hudoklin
bc6b180d90
nixos/statsd: add support for external backends, fix a few options
2014-09-11 18:11:16 +02:00
Jaka Hudoklin
19ea435cf8
nixos: add graphite api to graphite functionality
2014-09-11 18:09:40 +02:00
Eelco Dolstra
05163e99db
nixos-rebuild: Don't pass -K by default
2014-09-10 14:57:26 +02:00
Eelco Dolstra
624efa4224
Support users-groups.json referring to store paths
...
Fixes #4016 .
2014-09-10 11:50:45 +02:00
Luca Bruno
ac724e7bbc
Added TORQUE package and nixos module
...
Resource management system for submitting and controlling
jobs on supercomputers, clusters, and grids
http://www.adaptivecomputing.com/products/open-source/torque
2014-09-09 18:24:46 +02:00
Bjørn Forsman
e84b0c94f0
nixos/jekins: rename option services.jenkins.{extraOpts => extraOptions}
...
I noticed "extraOptions" is infinitely more used than "extraOpts" in
NixOS.
2014-09-09 17:40:53 +02:00
Bjørn Forsman
cb614ef4ad
nixos/jenkins: remove use of types.string (it's deprecated)
2014-09-09 17:36:25 +02:00
Bjørn Forsman
cf7b782ea9
nixos/jenkins: add services.jenkins.extraOpts option
...
Allows passing extra command line arguments to Jenkins.
2014-09-09 17:36:25 +02:00
Luca Bruno
e4e39f26ba
Change default from gnome 3.10 to gnome 3.12
2014-09-08 18:35:45 +02:00
Eelco Dolstra
1a9c27c092
Typo
2014-09-08 13:58:44 +02:00
Eelco Dolstra
152ae27aac
Merge remote-tracking branch 'origin/systemd-216' into staging
2014-09-08 13:53:33 +02:00
Luca Bruno
dfa6f03ea3
Do not assert absolute path for nodev grub device. Closes #3996
2014-09-08 12:00:34 +02:00
Eelco Dolstra
585983bc95
Merge remote-tracking branch 'origin/staging'
...
Conflicts:
pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00