3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

86 commits

Author SHA1 Message Date
Domen Kožar ad197d89ae Merge pull request #7181 from jagajaga/teamviewer
Teamviewer
2015-04-06 14:13:07 +02:00
Arseniy Seroka 0998212640 impl: teamviewer daemon 2015-04-05 20:47:01 +03:00
William A. Kennington III ff21171921 Fix references to current-system/sw/sbin 2015-04-01 13:57:36 -07:00
Jaka Hudoklin 916aab2927 Merge pull request #6875 from offlinehacker/nixos/cadvisor/fix
nixos/cadvisor: fixes
2015-03-21 22:36:11 +01:00
Rickard Nilsson bdbdaee3c0 scollector module: Add extraOpts option 2015-03-18 21:16:31 +01:00
Jaka Hudoklin 536694bcd4 nixos/cadvisor: fixes
- run as non root user, because of docker
- run docker by default
2015-03-18 14:31:08 +01:00
Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
William A. Kennington III c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
Rob Vermaas c5caa853ec dd-agent: set SSL_CERT_FILE for dogstatsd.
(cherry picked from commit c67204dec2)
2015-01-05 13:15:22 +01:00
Tobias Geerinckx-Rice c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
Jaka Hudoklin b6198f08e3 nixos: add cadvisor service 2014-12-28 20:21:41 +01:00
Bjørn Forsman 0a8623d6a9 nixos/munin: add /var/setuid-wrappers to PATH
/var/setuid-wrappers is an extension of the system profile, so it
belongs in PATH for the munin service.
2014-12-25 15:43:51 +01:00
Domen Kožar 55cf272c19 fixes #5198 2014-12-02 12:59:14 +01:00
Oliver Charles abd24523f3 scollector: Allow users to specify external collectors 2014-11-24 14:40:48 +00:00
Oliver Charles 1280c6aa64 Add an extraConfig option to bosun 2014-11-24 14:40:48 +00:00
Oliver Charles fb67616588 scollector should talk to Bosun, not OpenTSDB 2014-11-24 14:40:48 +00:00
Oliver Charles 891c262e9a Add a NixOS module to run bosun 2014-11-24 14:40:47 +00:00
Oliver Charles 2ed07c6cc1 scollector: New NixOS module 2014-11-24 14:40:47 +00:00
Rickard Nilsson 76f065a8de nixos/riemann: Add option configFiles 2014-11-19 12:56:42 +01:00
Charles Strahan 973794b24a bundixify riemann-dash 2014-11-18 03:31:56 +00:00
Charles Strahan 6e6ac35024 more rubyLibs renaming 2014-11-12 22:32:32 +00:00
Jaka Hudoklin d232390d5d nixos/graphite: fix user creation 2014-11-04 19:38:24 +01:00
Longrin Wischnewski ce8e1a278b zabbix-server: add extraConfig option
add types to options
2014-11-03 16:47:07 +01:00
Peter Simons 415f41bf68 nixos/modules/services/monitoring/graphite.nix: strip trailing whitespace 2014-11-02 12:40:00 +01:00
Peter Simons 96a7e65c37 nixos/modules/services/monitoring/graphite.nix: don't create graphite user unconditionally
I'm not sure what exactly this user is needed for, i.e. under what circumstances
it must exist or not, but creating it unconditionally seems like the wrong thing
to do. I complained to @offlinehacker about this on Github, but got no response
for a week or so. I'm disabling the extraUsers bit to put out the fire, and now
hope that someone who actually knows about Graphite implements a proper solution
later.
2014-11-02 12:34:16 +01:00
Jaka Hudoklin 594f354bc7 nixos/graphite: fix grahite api documentation url 2014-10-20 13:32:58 +02:00
Jaka Hudoklin 09c8d909fb nixos/graphite: update docs, add graphite pager 2014-10-20 13:27:21 +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
Jaka Hudoklin 9bd66b24d9 nixos/graphiteApi: add example config for influxdb backend 2014-09-16 10:41:56 +02:00
Jaka Hudoklin 271e0f7488 nixos/graphite: add host and port options for graphiteApi 2014-09-16 10:28:04 +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
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
Bjørn Forsman db86b03b1c nixos/apcupsd: add systemd documentation hint
systemctl has the ability to display a list of documentation URLs in the
output of "systemctl status <service-name>".
2014-09-06 00:14:42 +02:00
Eelco Dolstra 59edfd61ad Increase systemd timeout on Jenkins and Munin tests
These were timing out a lot.

http://hydra.nixos.org/build/13991108
http://hydra.nixos.org/build/13991107
2014-09-05 15:50:55 +02:00
aszlig 8a56a55bb4
nixos/manual: Use literalExample when feasible.
Should bring most of the examples into a better consistency regarding
syntactic representation in the manual.

Thanks to @devhell for reporting.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-27 23:41:15 +02:00
Rickard Nilsson 8c78986553 Some pkgs.lib -> lib fixes 2014-08-25 14:40:40 +02:00
Rickard Nilsson b1d225b645 Add NixOS module for the Riemann dashboard server 2014-08-23 17:40:22 +02:00
Rickard Nilsson e9252cb35e Add NixOS module for Riemann monitoring server. 2014-08-23 17:40:22 +02:00
Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Bjørn Forsman 0a750e0f39 nixos/munin: change activationScript to preStart script
All activation scripts run in serial upon boot and nixos-rebuild switch
etc., in contrast to preStart which run before a service starts, and can
run in parallel with other services.

The munin(-node) activation script is particularly slow. Change it to a
preStart script so that it can run in parallel with other services and
not slow down boot (or nixos-rebuild switch).

This reduces (repeated) "nixos-rebuild test" time from ~16 seconds to ~8
on my (old) laptop.
2014-07-26 00:31:34 +02:00
Eelco Dolstra 95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Shea Levy b3cfb9084b Get all lib functions from lib, not pkgs.lib, in modules 2014-07-02 12:28:18 -04:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Austin Seipp 6cfa38ce7d nagios: significant upgrades
- Upgrade Nagios Core to 4.x
 - Expose mainConfigFile and cgiConfigFile in module for finer
   configuration control.
 - Upgrade Plugins to 2.x
 - Remove default objectDefs, which users probably want to customize.
 - Systemd-ify Nagios module and simplify directory structure
 - Upgrade Nagios package with more modern patch, and ensure the
   statedir is set to /var/lib/nagios

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-22 00:22:10 -05:00
Bjørn Forsman 054a3c0321 nixos/graphite-service: clean up restartTriggers
Currently, the restartTriggers are abusing the systemd unit file in that
the cfg.carbon.config/storageAggregation/... option text is pasted into
the unit file. Even though this sort-of works (the service is restarted
if the config changes) this causes systemd to print error messages about
invalid sections (rightfully so!).

The correct use of restartTriggers is to list storage paths, which is
what this change does. If any of the
cfg.carbon/config/storageAggregation/... options change, configDir will
get a new hash. It is not as "fine grained" as the current version, but
it is not abusing the interface.

Also, remove unneeded 'waitress' in one of the restartTriggers, because
it is already listed as part of the service config.
2014-06-09 11:40:33 +02:00