Disable Zabbix
Eelco Dolstra committed
Jul 18, 2017 at 17:48 UTC
448c2e24f24581a75a6299a46efdc1e9d4b22566
2 files changed
-42
delft/delft-webserver.nix
-38
@@ -4,28 +4,6 @@ with pkgs.lib;
4
5
let
6
7
- zabbixMail = pkgs.writeScriptBin "zabbix-mail" ''
8
- #!/bin/sh
9
- set -e
10
-
11
- export zabbixemailto="$1"
12
- export zabbixsubject="$2"
13
- export zabbixbody="$3"
14
-
15
- ${pkgs.ssmtp}/sbin/sendmail -v $zabbixemailto <<EOF
16
- Subject: $zabbixsubject
17
- To: $zabbixemailto
18
-
19
- $zabbixbody
20
- EOF
21
- '';
22
-
23
- ZabbixApacheUpdater = pkgs.fetchsvn {
24
- url = https://www.zulukilo.com/svn/pub/zabbix-apache-stats/trunk/fetch.py;
25
- sha256 = "1q66x429wpqjqcmlsi3x37rkn95i55nj8ldzcrblnx6a0jnjgd2g";
26
- rev = 94;
27
- };
28
-
7
strategoxtVHostConfig =
8
{ hostName = "strategoxt.org";
9
servedFiles = [
@@ -85,13 +63,6 @@ in
63
SSLHonorCipherOrder on
64
'';
65
88
- phpOptions =
89
- ''
90
- #max_execution_time = 2
91
- memory_limit = "128M"
92
- max_input_time = 300
93
- '';
94
-
66
servedDirs =
67
[ { urlPath = "/apache-errors";
68
dir = ./apache-errors;
@@ -135,9 +106,6 @@ in
106
};
107
}
108
*/
138
- { serviceType = "zabbix";
139
- urlPrefix = "/zabbix";
140
- }
109
];
110
servedDirs = [
111
{ urlPath = "/releases";
@@ -216,10 +184,4 @@ in
184
};
185
186
};
219
-
220
- environment.systemPackages = [ zabbixMail ];
221
-
222
- nixpkgs.config.packageOverrides = pkgs: {
223
- php = pkgs.php56;
224
- };
187
}
delft/wendy.nix
-4
@@ -134,10 +134,6 @@ with lib;
134
systemd.services.httpd.serviceConfig.MemoryLimit = "1500M";
135
#systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.limit_in_bytes 1500M" ];
136
137
- services.zabbixServer.enable = true;
138
- #services.zabbixServer.dbServer = "wendy";
139
- #services.zabbixServer.dbPassword = import ./zabbix-password.nix;
140
-
137
services.logrotate.enable = true;
138
services.logrotate.config = ''
139
/var/log/httpd/access_log