Oliver Charles
acb7f43db9
nixos/prometheus: add external_labels option
2017-11-17 10:16:21 +00:00
Oliver Charles
f0334c0336
nixos/prometheus: add scrape_configs.honor_labels
2017-11-17 10:15:37 +00:00
Matt McHenry
292715ce23
smartd: fix 'cat: command not found' error
2017-11-13 12:52:24 -05:00
Guillaume Maudoux
7325ad9ab7
graphite: override django and django_tagging
...
instead of depending on specific versions in the django_tagging_0_4_3
and graphite_web derivations.
This should fix: https://github.com/NixOS/nixpkgs/pull/30277#discussion_r145393088
This was joint work of @basvandijk and @layus at NixCon 2017.
2017-11-04 17:53:35 +01:00
Bas van Dijk
04b2460eb6
graphite: fix the graphiteApi service
2017-10-31 15:49:59 +01:00
Franz Pletz
a26b6c4290
prometheus-node-exporter service: delete dead code
2017-10-25 20:18:33 +02:00
Franz Pletz
ce301ef21a
prometheus-node-exporter service: add disabledCollectors option
2017-10-25 20:10:20 +02:00
Franz Pletz
63bbada520
prometheus-node-exporter service: run as nobody again
...
Using DynamicUser breaks the systemd and logind collectors.
cc #30535
2017-10-25 17:49:40 +02:00
Pascal Bach
0f0f0cbc6f
prometheus-node-exporter service: update for new arguments handling
...
The behaviour have changed again. Listed collectors are now enabled in
addition to the default one.
Also run as DynmicUser instead of user nobody as the exporter doesn't need
any state.
2017-10-22 14:45:48 +02:00
Florian Jacob
43f94ff5a9
nixos/munin: move munin-cron to systemd.tmpfiles
...
to match with munin-node.
2017-10-21 11:27:42 +01:00
Florian Jacob
3338985aab
nixos/munin: Create MUNIN_PLUGSTATE dir to fix munin_stats plugin
2017-10-21 11:27:42 +01:00
Peter Simons
757a759005
Merge pull request #30166 from LumiGuide/graphite-1.0.2
...
Fix graphite crash by upgrading from 0.9.15 -> 1.0.2
2017-10-18 12:58:55 +01:00
Peter Hoeg
e01bb0c0d0
Revert "smartd: set drive timeout"
...
This reverts commit 41306ca505
.
2017-10-14 14:42:49 +08:00
Peter Hoeg
2b5aab4b0f
Revert "sensu: nixos module"
...
This reverts commit 707c3ac435
.
2017-10-14 14:42:49 +08:00
Peter Hoeg
707c3ac435
sensu: nixos module
2017-10-14 14:38:04 +08:00
Peter Hoeg
41306ca505
smartd: set drive timeout
2017-10-14 14:38:04 +08:00
Joerg Thalheim
e7e4e0c3b6
nixos/prometheus-minio-exporter: only inherit keys from minio if set
2017-10-08 15:05:25 +01:00
Pascal Bach
8e10a4d862
prometheus-minio-exporter service: default to local minio server if enabled
2017-10-08 15:09:25 +02:00
Pascal Bach
aad88ddf5b
prometheus-minio-exporter service: init version
2017-10-08 12:47:00 +02:00
Bas van Dijk
5b8ff5ed49
graphite: 0.9.15 -> 1.0.2
...
Fixes : #29961
Also added the option:
services.graphite.web.extraConfig
for configuring graphite_web.
2017-10-08 03:03:22 +02:00
michael bishop
0ee6f8612e
dd-agent: fix multiple tags in the config file
2017-10-05 19:33:18 -03:00
Ryan Mulligan
c6f513b56a
nixos/monit: install monit as system package, use default config file path
2017-09-28 01:20:20 +02:00
Philipp Hausmann
1a23ff8a13
FusionInventory: Code cleanup
2017-09-25 10:39:11 +02:00
Philipp Hausmann
6b788e36df
FusionInventory: Add NixOS module.
2017-09-25 10:39:11 +02:00
Pascal Bach
a217d73381
node-exporter service: fix documentation for enabledCollectors
2017-09-12 22:38:17 +02:00
Pascal Bach
334e23d244
nixos/prometheus-collectd-exporter: init module ( #29212 )
...
* prometheus-collectd-exporter service: init module
Supports JSON and binary (optional) protocol
of collectd.
* nixos/prometheus-collectd-exporter: submodule is not needed for collectdBinary
2017-09-11 19:17:00 +01:00
Robin Gloster
ce7e2c06b1
prometheus-unifi-exporter: make ordering more robust
2017-08-22 20:26:18 +02:00
Jean-Pierre PRUNARET
e6157451c1
nixos/munin: scripts need to be executable in order to build a wrapper
...
"Builder called die: Cannot wrap
/nix/store/XXX-munin-available-plugins/plugin.sh because it is not an
executable file"
[Bjørn: Keep DRY, quote "$file".]
2017-08-14 07:50:32 +02:00
Franz Pletz
5d2764eb68
prometheus-blackbox-exporter: 0.5.0 -> 0.8.1
2017-08-12 11:05:23 +02:00
Charles Strahan
c1fdf3341b
Merge pull request #27347 from cstrahan/osquery-new
...
osquery: init at 2.5.2
2017-07-24 21:51:10 -04:00
Charles Strahan
53426f6cb9
osquery: init at 2.5.2
2017-07-24 21:47:32 -04:00
Volth
a1212c7784
collectd service: removed insecure AmbientCapabilities
2017-06-30 11:57:46 +00:00
Volth
67340baa9b
collectd service: minor refactoring
...
* removed pid-file support, it is needless to run collectd as systemd service
* removed static user id, as all the files reowned on the service start
* added ambient capabilities for ping and smart (hdd health) functions
2017-06-30 00:52:22 +00:00
Franz Pletz
271d3f7a43
prometheus service: globalConfig.labels is obsolete
...
Due to the version bump in e60c958811
.
2017-06-27 01:53:03 +02:00
Mateusz Kowalczyk
dcf171bc79
Revert "dd-agent: 5.11.2 -> 5.13.2 + service rework"
...
This reverts commit af096c8bff
.
2017-06-03 12:27:56 +01:00
Mateusz Kowalczyk
668556331b
Revert "datadog: Properly use configured package."
...
This reverts commit 50f53da9ef
.
2017-06-03 12:27:43 +01:00
Mateusz Kowalczyk
50f53da9ef
datadog: Properly use configured package.
2017-06-02 08:16:47 +01:00
Mateusz Kowalczyk
af096c8bff
dd-agent: 5.11.2 -> 5.13.2 + service rework
2017-06-01 15:08:50 +01:00
Albert Peschar
39a121303f
services.graphite: chmod -R entire dataDir
2017-05-31 01:25:04 +02:00
Franz Pletz
1e95e114e5
nixos/xsession: use graphical systemd user target
...
While systemd suggests using the pre-defined graphical-session user
target, I found that this interface is difficult to use. Additionally,
no other major distribution, even in their unstable versions, currently
use this mechanism.
The window or desktop manager is supposed to run in a systemd user service
which activates graphical-session.target and the user services that are
binding to this target. The issue is that we can't elegantly pass the
xsession environment to the window manager session, in particular
whereas the PassEnvironment option does work for DISPLAY, it for some
mysterious reason won't for PATH.
This commit implements a new graphical user target that works just like
default.target. Services which should be run in a graphical session just
need to declare wantedBy graphical.target. The graphical target will be
activated in the xsession before executing the window or display manager.
Fixes #17858 .
2017-05-29 15:05:28 +02:00
Domen Kožar
14f5a3d760
nixos datadog module: add processConfig option
2017-05-04 13:25:45 +02:00
Rob Vermaas
a9f054c834
dd-agent: Add default config files of dd-agent and auto_conf dir
...
to /etc/dd-agent/conf.d by default, and make sure
/etc/dd-agent/conf.d is used.
Before NixOS 17.03, we were using dd-agent 5.5.X which
used configuration from /etc/dd-agent/conf.d
In NixOS 17.03 the default conf.d location is first used relative,
meaning that $out/agent/conf.d was used without NixOS overrides.
This change implements similar functionality as PR #25288 , without
breaking backwards compatibility.
(cherry picked from commit 77c85b0ecb
)
2017-05-04 09:47:21 +00:00
Michael Raskin
3ecaf3b4b5
Merge pull request #25168 from tadfisher/ups-fix
...
ups: fix config generation
2017-05-01 16:09:18 +02:00
Michael Raskin
7e19fcddcc
Merge pull request #24366 from rvl/longview-password-file
...
longview service: don't write passwords to nix store
2017-05-01 09:39:35 +02:00
Michael Raskin
01ba1a40d3
Merge pull request #24341 from LumiGuide/cadviser-storageDriverPasswordFile
...
cadviser: add storageDriverPasswordFile option
2017-05-01 02:01:49 +02:00
Bjørn Forsman
c282de7103
nixos/munin: remove duplicated /run/current-system/sw/bin path
...
A side effect of commit ff21171921
("Fix references to current-system/sw/sbin"). It changed "sbin" to "bin"
but didn't check for duplicates.
2017-04-30 21:04:51 +02:00
Andrew Martin
e289b94fbe
graphite service: no recursive chown when starting ( #24442 )
...
Fixes #24444
2017-04-27 17:33:42 +02:00
Tad Fisher
bf427b9bae
ups: fix config generation
2017-04-23 21:35:48 -07:00
John Ericson
37e5e71fdf
Merge pull request #24974 from Ericson2314/mapNullable
...
Introduce `mapNullable` into lib and use it in a few places
2017-04-17 17:12:14 -04:00
John Ericson
85aa5005af
Introduce mapNullable
into lib and use it in a few places
...
Also simply some configure flag logic my grep also alerted me too.
2017-04-17 17:04:04 -04:00
Franz Pletz
3ab45f4b36
treewide: use boolToString function
2017-04-11 18:18:53 +02:00
Franz Pletz
4f0dd2f746
prometheus service: add scrapeConfigs.params option
2017-04-10 14:31:27 +02:00
Bas van Dijk
2030a91f58
cadviser: add storageDriverPasswordFile option
...
This gives users the option of storing the storageDriverPassword outside the
world-readable Nix store.
2017-04-08 14:15:18 +02:00
Rodney Lorrimar
db14ea3926
longview service: don't write passwords to nix store
...
Adds services.longview.{apiKeyFile,mysqlPasswordFile} options as
alternatives to apiKey and mysqlPassword, which still work, but are
deprecated with a warning message.
Related to #24288 .
2017-03-26 23:06:42 +01:00
Jörg Thalheim
b4169bb8dd
munin: fix tests by replacing cron with systemd timer
2017-03-22 00:16:36 +01:00
Franz Pletz
9536169074
nixos/treewide: remove boolean examples for options
...
They contain no useful information and increase the length of the
autogenerated options documentation.
See discussion in #18816 .
2017-03-17 23:36:19 +01:00
Pascal Bach
3728143cbc
prometheus-unifi-exporter: init at 0.4.0
2017-03-17 15:41:22 +01:00
Pascal Bach
a8cca7037e
prometheus-fritzbox-exporter: init at 1.0
2017-03-15 17:22:36 +01:00
Gregor Kleen
899fd868ea
das_watchdog: fix service type
2017-03-09 16:14:17 +01:00
Benjamin Staffin
1c555e772e
Merge pull request #23155 from doshitan/fix-prometheus-basic-auth
...
prometheus service: fix basic auth option
2017-02-24 15:08:35 -05:00
Tanner Doshier
b846ce5243
prometheus service: fix basic auth option
...
If some configuration is provided, we need to filter out the `_module` key or
else it breaks prometheus.
2017-02-24 13:32:01 -06:00
Jörg Thalheim
0338817f62
vnstat: provide full path of "kill" in ExecReload
2017-02-21 09:26:25 +00:00
florianjacob
c23c2c50de
munin service: listen on IPv6 loopback as well ( #23012 )
...
munin service: listen on IPv6 loopback as well
2017-02-20 06:13:48 +01:00
Franz Pletz
188526da3d
prometheus.blackboxExporter service: add CAP_NET_RAW
...
The blackbox-exporter for prometheus needs CAP_NET_RAW for sending icmp
probes.
2017-02-15 09:35:27 +01:00
Parnell Springmeyer
9e36a58649
Merging against upstream master
2017-02-13 17:16:28 -06:00
Rickard Nilsson
cda4a4dcfc
nixos/grafana: Don't print password warning if no password has been set
2017-02-13 23:11:40 +01:00
Parnell Springmeyer
6777e6f812
Merging with upstream
2017-01-29 05:54:01 -06:00
Parnell Springmeyer
4aa0923009
Getting rid of the var indirection and using a bin path instead
2017-01-29 04:11:01 -06:00
Parnell Springmeyer
e92b8402b0
Addressing PR feedback
2017-01-28 20:48:03 -08:00
Michael Peyton Jones
46c0da1818
arbtt: multi-user.target does not exist in user systemd
2017-01-28 14:29:19 +00:00
Parnell Springmeyer
a26a796d5c
Merging against master - updating smokingpig, rebase was going to be messy
2017-01-26 02:00:04 -08:00
Parnell Springmeyer
bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts
2017-01-25 11:08:05 -08:00
Kai
25d86bdd10
vnstat service: init ( #19809 )
2017-01-24 14:45:01 +01:00
Daiderd Jordan
2b2b0b566d
Merge pull request #20183 from womfoo/init/netdata-service
...
netdata service: init
2017-01-20 21:05:10 +01:00
Bjørn Forsman
d2413943fa
nixos/prometheus: add configText option for alertmanager
...
The reason being less mental overhead when reading upstream
documentation. Examples can be pasted right into the configuration
instead of translating to Nix attrset first.
2017-01-14 15:41:05 +01:00
Jörg Thalheim
62708c29f8
Merge pull request #21570 from michaelpj/services/arbtt
...
arbtt service: init
2017-01-11 22:27:52 +01:00
oida
d423567a95
prometheus-snmp-exporter: added nixos module
2017-01-09 18:05:28 +01:00
Robin Gloster
575afe3fa7
prometheus exporter modules: unify firewall handling
2017-01-09 15:31:37 +01:00
Corbin
618b249fc5
prometheus module: add blackboxExporter
2017-01-09 15:20:26 +01:00
Corbin
bd45d5fe8d
prometheus module: add jsonExporter
2017-01-09 15:20:26 +01:00
Corbin
1b839a586b
prometheus module: add varnishExporter
2017-01-09 15:20:26 +01:00
Corbin
363fa27448
promeutheus.nginxExporter: add improvements
...
- use ExecStart and ExecReload
- add extraFlags
2017-01-09 15:20:26 +01:00
Robin Gloster
39e8eaf8b6
prometheus module: add nginxExporter
2017-01-09 15:20:26 +01:00
Michael Peyton Jones
10e2d88f6c
arbtt service: init
2017-01-01 18:59:01 +00:00
Bjørn Forsman
9ec867f59f
nixos/prometheus: unbreak alertmanager default config
...
The current default value of listenAddress = null blows up:
$ nixos-rebuild build
error: cannot coerce null to a string, at
.../nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix:97:16
With listenAddress = "" we use the same default as upstream and there is
no blow up :-)
2016-12-28 13:52:15 +01:00
lassulus
cfbe501d4e
nixos/graphite: fix beacon config parameter
2016-12-27 19:38:18 +01:00
Bjørn Forsman
b20fdff521
nixos/prometheus: make scrapeConfigs.*.static_configs.*.labels optional
...
...by providing a default value of "no labels" (an empty attrset).
Without this change we get
$ nixos-rebuild test -I nixpkgs=.
building Nix...
building the system configuration...
error: The option `services.prometheus.scrapeConfigs.[definition 1-entry 1].static_configs.[definition 1-entry 1].labels' is used but not defined.
which is unneeded, because labels _are_ optional.
2016-12-25 15:38:55 +01:00
Bjørn Forsman
caa476b357
nixos/prometheus: add services.prometheus.configText option
...
The structured options are incomplete compared to upstream and I think
it will be a maintenance burden to try to keep up. Instead, provide an
option for the raw config file contents (prometheus.yml).
2016-12-21 00:32:24 +01:00
Bjørn Forsman
ebe67d69d0
collectd service: change /var/lib/collectd perms: 700 -> 755
...
The collectd service runs as an unprivileged user by default, so it does
not leak more information to its data directory than any user can obtain
elsewhere by other means.
If people are running it as root and are worried about information leak,
we can add collectd group and set perms to 750.
CC @offlinehacker.
Fixes #21198 .
2016-12-16 23:04:42 +01:00
Corbin Simpson
27f1def068
nixos/collectd: Fix syntax error on some hostnames. ( #20694 )
...
Without this, hostnames that e.g. end in digits will cause syntax errors for
collectd.
2016-11-24 21:47:17 +01:00
Kranium Gikos Mendoza
2715222f0c
netdata service: init
2016-11-10 16:12:52 +08:00
Emery Hemingway
b675619391
nixos: use types.lines for extraConfig
2016-10-23 19:41:43 +02:00
Jörg Thalheim
5f886fb8cb
Merge pull request #19262 from chris-martin/riemann-health-ps
...
Fix riemann-health service (add missing procps dependency)
2016-10-20 22:11:43 +02:00
oida
725e04cc01
prometheus module: added default option values for relabel_config
2016-10-09 11:37:33 +02:00
Chris Martin
57023aba3d
riemann-health service: add procps to path ( #19237 )
2016-10-05 10:52:15 -04:00
Joachim F
0906a0f197
Merge pull request #18491 from groxxda/network-interfaces
...
Replace Network-interfaces.target
2016-10-02 16:34:37 +02:00
Joachim F
7e80c42b0e
Merge pull request #18511 from ericsagnes/feat/remove-optionSet
...
modules: optionSet -> submodule
2016-10-01 17:57:45 +02:00
0ida
619ab48988
prometheus: add options for alertmanager
2016-09-20 19:35:03 +02:00
0ida
fdded2c554
prometheus alertmanager module: init
2016-09-20 19:35:03 +02:00
Eric Sagnes
2d2c311304
cadvisor test: fix ( #18671 )
...
* influxdb module: add postStart
* cadvisor module: increase TimeoutStartSec
Under high load, the cadvisor module can take longer than the default 90
seconds to start. This change should hopefully fix the test on Hydra.
2016-09-16 22:06:16 +02:00
Robin Gloster
0201869418
prometheus.nodeExporter module: improve after feedback
...
cc @teh @groxxda @fpletz
2016-09-16 15:10:18 +02:00
zimbatm
7a6b860e1c
Merge pull request #18437 from Mic92/telegraf
...
Telegraf
2016-09-15 23:21:08 +01:00
Robin Gloster
55b8430f6f
Merge branch 'prometheus-node-exporter' of https://github.com/teh/nixpkgs into prometheus-nixos-exporter
2016-09-15 20:59:17 +02:00
Robin Gloster
e43a15720d
prometheus module: add nodeExporter submodule
2016-09-15 20:31:03 +02:00
Jörg Thalheim
8fddcad3f9
telegraf: init at 1.0.0
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2016-09-14 07:19:55 +02:00
Tom Hunger
0ded9a63a3
prometheus-node-exporter: Add module.
2016-09-13 11:28:45 +01:00
Alexander Ried
23ca90b013
monitoring.monit: get closer to upstream service definition
...
taken from
e02247e048/system/startup/monit.service.in
2016-09-13 11:19:22 +02:00
Joachim Fasting
1a60210561
nagios service: network-interfaces.target -> network.target
2016-09-13 11:19:22 +02:00
Joachim Fasting
b38c0c94ab
graphite service: network-interfaces.target -> network.target
2016-09-13 11:19:22 +02:00
Eric Sagnes
981df6387c
ups module: optionSet -> submodule
2016-09-13 12:53:10 +09:00
Eric Sagnes
06c11a62b3
smartd module: optionSet -> submodule
2016-09-13 12:53:10 +09:00
Franz Pletz
80f38e9032
prometheus service: move to separate folder
2016-09-11 23:20:26 +02:00
Franz Pletz
5a7e5537aa
Merge pull request #18298 from teh/prometheus-service
...
Prometheus service
2016-09-11 23:18:36 +02:00
Alexander Ried
27bc34f1e4
treewide: deprecate ip-up.target ( #18319 )
...
Systemd upstream provides targets for networking. This also includes a target network-online.target.
In this PR I remove / replace most occurrences since some of them were even wrong and could delay startup.
2016-09-10 18:03:59 +02:00
Tom Hunger
d459916501
prometheus service: rename values to match prometheus 1.0 naming.
2016-09-04 20:03:45 +01:00
Benjamin Staffin
58869cf310
prometheus service: add
...
This is based on @benleys work: https://github.com/NixOS/nixpkgs/pull/8216
I updated changed the user and group ids.
2016-09-04 20:03:32 +01:00
Parnell Springmeyer
98c058a1ee
Adapting everything for the merged permissions wrappers work.
2016-09-01 19:21:06 -05:00
Tuomas Tynkkynen
c73aa79a8f
graphite service: Use correct output of cairo
2016-08-23 03:20:21 +03:00
Corbin
09e75a4c29
services/graphite: Fix paths to some Python packages.
...
Unbreaks some private Graphite deployments.
2016-08-17 21:14:31 -07:00
Rob Vermaas
9494b764d2
dd-agent: support jmx, needs a separate daemon nowadays.
...
(cherry picked from commit 1425a1f964
)
2016-07-29 12:42:07 +00: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
Graham Christensen
d3d7f43f76
sysstat: Create systemd service for historical sar data
...
Every period, sa1 collects and stores data.
Every 24 hours, sa2 aggregates the previous day's data in to a
report.
Timers and unit configurations were lifted from Fedora's default
units.
2016-07-12 16:19:40 -05:00
Kamil Chmielewski
437ea9fd37
Fixes #16181 - using bin output for Go services
2016-06-13 23:32:16 +02:00
Franz Pletz
df8958435e
grafana: 2.6.0 -> 3.0.1 ( #15395 )
...
* grafana: 2.6.0 -> 3.0.1
* grafana module: Fix anonymous auth & add analytics config
2016-05-13 02:28:24 +02:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
makefu
626bfce3b8
graphite: fix carbonCache graphiteWeb graphiteApi
...
This commit implements the changes necessary to start up a graphite carbon Cache
with twisted and start the corresponding graphiteWeb service.
Dependencies need to be included via python buildEnv to include all recursive
implicit dependencies.
Additionally cairo is a requirement of graphiteWeb and pycairo is not a standard
python package (buildPythonPackage) and therefore cannot be included via
buildEnv. It also needs cairo in the Library PATH.
2016-03-12 02:02:04 +01:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Bjørn Forsman
d99033beb9
grafana service: unbreak
...
Accidentally broken by 4fede53c09
("nixos manuals: bring back package references").
Without this fix, grafana won't start:
$ systemctl status grafana
...
systemd[1]: Starting Grafana Service Daemon...
systemd[1]: Started Grafana Service Daemon.
grafana[666]: 2016/03/06 19:57:32 [log.go:75 Fatal()] [E] Failed to detect generated css or javascript files in static root (%!s(MISSING)), have you executed default grunt task?
systemd[1]: grafana.service: Main process exited, code=exited, status=1/FAILURE
systemd[1]: grafana.service: Unit entered failed state.
systemd[1]: grafana.service: Failed with result 'exit-code'.
2016-03-06 21:16:47 +01:00
Franz Pletz
fde23a01b4
nixos/collectd: Fix package option
...
Commit ed979124ca
was missing some code.
2016-02-28 14:55:58 +01:00
Vladimír Čunát
3cf9cd8bc3
Merge #12796 : nixos docs: show references to packages
...
(version 2) A better implementation of #10039 , after #12357 .
This time I did more thorough checking.
See commit messages for details.
2016-02-27 10:48:12 +01:00
Emery
b16dc8dcc5
New hdapsd module
2016-02-24 21:51:13 +01:00
Bjørn Forsman
b2b1511353
nixos/collectd: add defaultText to package option
...
CC @fpletz
2016-02-18 20:30:05 +01:00
Franz Pletz
ed979124ca
collectd service: Add option package
2016-02-18 03:44:55 +01:00
Vladimír Čunát
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Vladimír Čunát
4fede53c09
nixos manuals: bring back package references
...
This reverts most of 89e983786a
, as those references are sanitized now.
Fixes #10039 , at least most of it.
The `sane` case wasn't fixed, as it calls a *function* in pkgs to get
the default value.
2016-02-03 14:47:14 +01:00
Guillaume Maudoux
9f358f809d
Configure a default trust store for openssl
2016-02-03 12:42:01 +01:00
Vladimír Čunát
889351af8b
Revert "Merge #12357 : nixos docs: show references to packages"
...
The PR wasn't good enough yet.
This reverts commit b2a37ceeea
, reversing
changes made to 7fa9a1abce
.
2016-02-03 12:16:33 +01:00
Vladimír Čunát
b2a37ceeea
Merge #12357 : nixos docs: show references to packages
2016-02-03 10:07:27 +01:00
Eelco Dolstra
bfebc7342e
Fix some references to deprecated /etc/ssl/certs/ca-bundle.crt
2016-01-29 02:32:05 +01:00
Tuomas Tynkkynen
96372f2edb
treewide: Mass replace 'cairo}/lib' to refer the 'out' output
2016-01-24 10:03:33 +02:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Rickard Nilsson
d6f9f13512
bosun: Create ledisDir in pre-start script
2016-01-18 15:57:59 +01:00
Thomas Strobel
a04a7272aa
Add missing 'type', 'defaultText' and 'literalExample' in module definitions
...
- add missing types in module definitions
- add missing 'defaultText' in module definitions
- wrap example with 'literalExample' where necessary in module definitions
2016-01-17 19:41:23 +01:00
Vladimír Čunát
3bcf8ae879
nixos manuals: bring back package references
...
This reverts most of 89e983786a
, as those references are sanitized now.
Fixes #10039 , at least most of it.
The `sane` case wasn't fixed, as it calls a *function* in pkgs to get
the default value.
2016-01-13 12:04:31 +01:00
Robin Gloster
88292fdf09
jobs -> systemd.services
2016-01-07 06:39:06 +00:00
Peter Simons
d807b057ed
Merge pull request #11920 from bjornfor/rename-host-to-listen-address
...
Rename NixOS option names: 'host' to 'listenAddress'
2016-01-05 12:54:15 +01:00
Tobias Geerinckx-Rice
a133ef9a0c
liferea, graphite service: fix typo (agregator -> aggregator)
2016-01-05 01:03:50 +01:00
Bjørn Forsman
19aed49163
nixos/statsd: rename 'host' to 'listenAddress'
...
More descriptive option name.
2015-12-24 00:20:56 +01:00
Bjørn Forsman
8b9f3c8c35
nixos/graphite: rename 'host' to 'listenAddress'
...
More descriptive option name.
2015-12-24 00:20:39 +01:00
Bjørn Forsman
38ca880612
nixos/cadvisor: rename 'host' to 'listenAddress'
...
More descriptive option name.
2015-12-24 00:14:40 +01:00