jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,588 Commits 266 Branches 122 Tags 5.3 GiB
fbde5e027e
Commit Graph

59 Commits

Author SHA1 Message Date
Marc Weber
f3e6b42258 replace list by listOf using same style as for attrsOf 2013-03-14 17:09:21 +01:00
Peter Simons
415ff3c39a smartd: change 'devices' option from "list of strings" to "list of attribute sets" 
The smartd used to expect a list of devices to monitor. After this patch, it
expects a list of attribute sets, which may have two attributes:

 - device: path to the device (required)
 - options: smartd options to apply to this particular device (optional)

A concrete example configuration would be:

  services.smartd = {
    enable = true;
    devices = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ];
  };

Furthermore, the config option 'deviceOpts' can be used to configure options
that are applied to *every* device.
 2013-03-10 01:19:44 +01:00
Shea Levy
f3d4d24d6b dd-agent: Run as a separate user 2013-02-27 09:25:37 -05:00
Eelco Dolstra
ae4e94d9ac Rename ‘boot.systemd’ to ‘systemd’ 
Suggested by Mathijs Kwik.  ‘boot.systemd’ is a misnomer because
systemd affects more than just booting.  And it saves some typing.
 2013-01-16 12:33:18 +01:00
Shea Levy
19127aa416 Add dd-agent module 2013-01-08 16:19:51 -05:00
Eelco Dolstra
74bae63135 smartd: Remove unnecessary PartOf dependency 2013-01-07 16:01:22 +01:00
Mathijs Kwik
f61f0c139b systemd: convert smartd job to service 2012-12-27 12:23:50 +01:00
Rob Vermaas
859badc966 Zabbix agent: RemainAfterExit=true seems to give more reliable restarts, cannot completely figure out why, as Type=forking should be enough. 2012-12-11 20:54:19 +01:00
Eelco Dolstra
b1da38f564 Merge remote-tracking branch 'origin/master' into systemd 2012-11-30 16:12:04 +01:00
Eelco Dolstra
6705358ede Convert Zabbix agent/server to systemd 
Note all the crap systemd doesn't need :-)
 2012-10-26 16:22:19 +02:00
Jack Cummings
e8d8b6b399 smartd: Add options for each device being monitored 2012-10-09 14:00:59 -04:00
Eelco Dolstra
3ad370ae0a Merge remote-tracking branch 'origin/master' into systemd 
Conflicts:
	modules/misc/ids.nix
	modules/services/mail/postfix.nix
	modules/services/system/nscd.nix
	modules/services/x11/desktop-managers/xfce.nix
	modules/system/boot/stage-1.nix
 2012-09-28 11:35:27 -04:00
Peter Simons
5ef71c6d22 smartd: convert service to systemd 2012-09-25 16:38:05 -04:00
Eelco Dolstra
1e666c10fa Get rid of the last use of mkThenElse 2012-09-20 16:55:32 -04:00
Eelco Dolstra
44d091674b Merge branch 'master' of github.com:NixOS/nixos into systemd 
Conflicts:
	modules/config/networking.nix
	modules/services/networking/ssh/sshd.nix
	modules/services/ttys/agetty.nix
	modules/system/boot/stage-2-init.sh
	modules/system/upstart-events/shutdown.nix
 2012-07-16 17:27:11 -04:00
Eelco Dolstra
73532c3855 Global replace /var/run/current-system -> /run/current-system 2012-07-16 11:34:21 -04:00
Eelco Dolstra
4a95f8996b To ease migration to systemd, generate units from the ‘jobs’ option 
Also get rid of the ‘buildHook’ job option because it wasn't very useful.
 2012-06-16 00:19:43 -04:00
Eelco Dolstra
801cd7402c * Don't use ‘chown user.group’ since that syntax is not officially 
supported (you're supposed to say ‘chown user:group’).

svn path=/nixos/trunk/; revision=34161
 2012-05-17 19:43:32 +00:00
Joachim Schiele
bc6ca7944f fixed a upstart issue where upsd was never started 
svn path=/nixos/trunk/; revision=33494
 2012-03-31 11:39:30 +00:00
Eelco Dolstra
6093b54b73 * Zabbix: use the path attribute. 
svn path=/nixos/trunk/; revision=33278
 2012-03-19 19:43:31 +00:00
Eelco Dolstra
7278e37072 * Don't set DBHost if the database is on localhost, otherwise Zabbix 
will use TCP/IP instead of a Unix domain socket.
* Simplify Zabbix's start condition.  Zabbix now retries if the
  database is down instead of bailing out.

svn path=/nixos/trunk/; revision=32426
 2012-02-20 13:40:47 +00:00
Eelco Dolstra
b11a33717f * zabbix-server: don't require PostgreSQL to be started 
if we're using a remote server.

svn path=/nixos/trunk/; revision=31852
 2012-01-26 13:32:02 +00:00
Peter Simons
0cd9ff9fcc smartd: run smartd daemon using the given search path to improve readability of ps output 
svn path=/nixos/trunk/; revision=30569
 2011-11-25 17:09:44 +00:00
Peter Simons
ef932017fc smartd: run the mail notification script with ${pkgs.stdenv.shell} rather than /bin/sh 
svn path=/nixos/trunk/; revision=30568
 2011-11-25 17:09:37 +00:00
Peter Simons
20b364f4de Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc. 
After the change from revision 30103, nixos-rebuild suddenly consumed
freaky amounts of memory. I had to abort the process after it had
allocated well in excess of 30GB(!) of RAM. I'm not sure what is causing
this behavior, but undoing that assignment fixes the problem. The other
two commits needed to be revoked, too, because they depend on 30103.

svn path=/nixos/trunk/; revision=30127
 2011-10-30 15:19:58 +00:00
Shea Levy
09cf6ce70c find modules | fgrep .nix | fgrep -v .svn | fgrep -v nixpkgs.nix | xargs sed -i -e 's|/nix/var|${config.nixpkgs.config.nix.stateDir}|g' -e 's|/nix/store|${config.nixpkgs.config.nix.storeDir}|g' 
Don't assume /nix/store or /nix/var in NixOS modules, this is configurable

svn path=/nixos/trunk/; revision=30104
 2011-10-29 21:03:57 +00:00
Lluís Batlle i Rossell
1fe1481adf Fixing systemhealth for kernels 3.x 
svn path=/nixos/trunk/; revision=30068
 2011-10-27 18:06:54 +00:00
Lluís Batlle i Rossell
62dede7121 The system health url moved. 
svn path=/nixos/trunk/; revision=29881
 2011-10-18 21:44:06 +00:00
Peter Simons
8abea71eaa modules/services/monitoring/smartd.nix: run the daemon with --no-fork to make life easier for upstart 
svn path=/nixos/trunk/; revision=29287
 2011-09-14 18:30:10 +00:00
Peter Simons
d1cf78c756 modules/services/monitoring/smartd.nix: provide the implicitly set flag '-a' explicitly 
svn path=/nixos/trunk/; revision=29286
 2011-09-14 18:30:07 +00:00
Peter Simons
eb6e1310b8 strip trailing whitespace; no functional change 
svn path=/nixos/trunk/; revision=29285
 2011-09-14 18:20:50 +00:00
Eelco Dolstra
7dc59f0bb0 * Zabbix: only enable PostgreSQL if it's on the same machine. 
svn path=/nixos/trunk/; revision=29185
 2011-09-11 15:55:43 +00:00
Peter Simons
a84ada1d92 modules/services/monitoring/smartd.nix: pass TZ variable to smartd to ensure that notification e-mails have a proper time zone 
svn path=/nixos/trunk/; revision=28702
 2011-08-19 20:44:12 +00:00
Nicolas Pierron
66ffeb3fd9 UPS: Make sure the driver pid files can be stored. 
svn path=/nixos/trunk/; revision=27979
 2011-07-27 20:55:39 +00:00
Nicolas Pierron
e231543033 Add new services: freepops, fuppes and ups. 
svn path=/nixos/trunk/; revision=27977
 2011-07-27 20:55:28 +00:00
Peter Simons
3a1b6266e4 modules/services/monitoring/smartd.nix: added services.smartd.devices option to configure list of devices to monitor 
By default -- if this option is unset --, all connected devices will be
monitored. Hard-coding the list of devices is worth-while, though, because this
will also configure smartd to send e-mail messages to 'root' when a test fails.

svn path=/nixos/trunk/; revision=27888
 2011-07-21 19:32:15 +00:00
Peter Simons
fb1b0c0372 modules/services/monitoring/smartd.nix: added support for running smart daemon 
Set "services.smartd.enable = true" to enable the service.

svn path=/nixos/trunk/; revision=27767
 2011-07-13 17:47:34 +00:00
Eelco Dolstra
1c451d351f * Make the location of the database configurable. 
svn path=/nixos/trunk/; revision=24888
 2010-11-26 22:50:57 +00:00
Michael Raskin
1b41b6d16d Fix Monit startOn parameter 
svn path=/nixos/trunk/; revision=24832
 2010-11-24 06:13:37 +00:00
Eelco Dolstra
f729f12e4e Some cleanups in the activation script: 
* Moved some scriptlets to the appropriate modules.
* Put the scriptlet that sets the default path at the start, since it
  never makes sense not to have it there.  It no longer needs to be
  declared as a dependency.
* If a scriptlet has no dependencies, it can be denoted as a plain
  string (i.e., `noDepEntry' is not needed anymore).

svn path=/nixos/trunk/; revision=23762
 2010-09-13 15:41:38 +00:00
Eelco Dolstra
d317d83ba8 * Remove `stopOn = "shutdown"' which doesn't work. 
svn path=/nixos/trunk/; revision=22101
 2010-06-02 16:05:09 +00:00
Rob Vermaas
c17a76279d zabbix agent: extraConfig 
svn path=/nixos/trunk/; revision=20048
 2010-02-16 12:51:28 +00:00
Eelco Dolstra
f013236f1e * Idem for zabbix-agent. 
svn path=/nixos/trunk/; revision=20040
 2010-02-16 10:15:20 +00:00
Eelco Dolstra
9127795e4a * Make sure that Upstart notices when the Zabbix server crashes so 
that it can be restarted.  Zabbix is kind of hard to monitor, so use
  a trick with an open fifo to detect when it goes down.

svn path=/nixos/trunk/; revision=20039
 2010-02-16 10:10:59 +00:00
Eelco Dolstra
97f30fb17b * The Zabbix agent should start after the hostname is set. 
svn path=/nixos/trunk/; revision=20029
 2010-02-15 20:34:01 +00:00
Eelco Dolstra
83b76bc2cf * Option `services.apache.phpIni' (which is of type derivation) 
replaced by `services.apache.phpOptions' (of type string).
* Allow Apache subservices to add to phpOptions.
* Set the TZ environment variable in Apache.
* Updated the Zabbix web interface.

svn path=/nixos/trunk/; revision=20023
 2010-02-15 19:02:42 +00:00
Eelco Dolstra
014ffaac5d * Update the Zabbix agent module. 
svn path=/nixos/trunk/; revision=20019
 2010-02-15 17:13:43 +00:00
Michael Raskin
b628ca221d Fix Monit upstart dependency 
svn path=/nixos/trunk/; revision=18964
 2009-12-15 13:32:10 +00:00
Lluís Batlle i Rossell
60b856b115 Adding a module for system health monitoring (getting graphs generated by rrdtool 
of usual system counters).
It sets up some cron jobs for collecting the data, and not that often, generating the
graphs. Then the httpd server is configured with a directory with the generated
static files.

http://www.brianlane.com/software/systemhealth/

svn path=/nixos/trunk/; revision=18866
 2009-12-09 21:45:59 +00:00
Eelco Dolstra
aa9d0a067e * Sync with the trunk. 
svn path=/nixos/branches/upstart-0.6/; revision=18408
 2009-11-18 11:50:06 +00:00