Disable the webserver on wendy
Eelco Dolstra committed
Jun 4, 2013 at 11:40 UTC
2fba057240e2392922ebfecc54b5d0f7e13b6493
2 files changed
+8
-18
delft/cartman.nix
+1
@@ -557,6 +557,7 @@ rec {
557
SetEnvIfNoCase Request_URI /api/ no-gzip dont-vary
558
SetEnvIfNoCase Request_URI /download/ no-gzip dont-vary
559
</Location>
560
+
561
'';
562
}
563
delft/wendy.nix
+7
-18
@@ -3,15 +3,6 @@
3
{
4
require = [ ./build-machines-dell-r815.nix ];
5
6
- services.httpd.enable = true;
7
- services.httpd.adminAddr = "e.dolstra@tudelft.nl";
8
- services.httpd.enableUserDir = true;
9
- services.httpd.hostName = "wendy";
10
- services.httpd.extraConfig =
11
- ''
12
- UseCanonicalName On
13
- '';
14
-
6
fileSystems."/backup" =
7
{ device = "130.161.158.5:/dxs/users4/group/buildfarm";
8
fsType = "nfs4";
@@ -88,11 +79,12 @@
79
synchronous_commit = off
80
'';
81
authentication = ''
91
- host all all 192.168.1.25/32 md5
82
+ host all all 192.168.1.25/32 md5
83
host hydra hydra 192.168.1.26/32 md5
84
host hydra_test hydra 192.168.1.26/32 md5
94
- host mediawiki mediawiki 192.168.1.5/32 md5
95
- host zabbix zabbix 192.168.1.5/32 md5
85
+ host mediawiki mediawiki 192.168.1.5/32 md5
86
+ host mediawiki mediawiki 192.168.1.26/32 md5
87
+ host zabbix zabbix 192.168.1.5/32 md5
88
'';
89
};
90
@@ -110,12 +102,9 @@
102
UserParameter=hydra.builds,${pkgs.postgresql}/bin/psql hydra -At -c 'select count(*) from Builds'
103
'';
104
113
- services.cron = {
114
- systemCronJobs =
115
- [
116
- "15 4 * * * root cp -v /var/backup/postgresql/* /backup/wendy/postgresql/ &> /var/log/backup-db.log"
117
- ];
118
- };
105
+ services.cron.systemCronJobs =
106
+ [ "15 4 * * * root cp -v /var/backup/postgresql/* /backup/wendy/postgresql/ &> /var/log/backup-db.log"
107
+ ];
108
109
networking.firewall.allowedTCPPorts = [ 80 3000 3001 4000 5432 ];
110
}