Switch back to the "prefork" MPM
Hopefully this fixes some weird Apache hangs...
Eelco Dolstra committed
Jun 13, 2013 at 13:06 UTC
0a41ff1029d1aa3d532f1dbb416614c5c8d93b5b
1 file changed
+26
-12
nixos-org/webserver.nix
+26
-12
@@ -6,7 +6,7 @@ let
6
7
nixosVHostConfig =
8
{ hostName = "nixos.org";
9
- serverAliases = [ "test.nixos.org" "test2.nixos.org" "ipv6.nixos.org" ];
9
+ serverAliases = [ "test.nixos.org" "test2.nixos.org" "ipv6.nixos.org" "localhost" ];
10
documentRoot = "/home/eelco/nix-homepage";
11
enableUserDir = true;
12
servedDirs =
@@ -61,6 +61,13 @@ let
61
</Location>
62
63
Redirect /binary-cache http://cache.nixos.org
64
+
65
+ <Location /server-status>
66
+ SetHandler server-status
67
+ Allow from 127.0.0.1
68
+ Order deny,allow
69
+ Deny from all
70
+ </Location>
71
'';
72
73
extraSubservices =
@@ -96,11 +103,17 @@ in
103
networking.firewall.allowPing = true;
104
networking.firewall.allowedTCPPorts = [ 80 443 ];
105
106
+ networking.defaultMailServer = {
107
+ directDelivery = true;
108
+ hostName = "smtp.tudelft.nl";
109
+ domain = "st.ewi.tudelft.nl";
110
+ };
111
+
112
security.pam.enableSSHAgentAuth = true;
113
114
services.httpd = {
115
enable = true;
103
- multiProcessingModule = "worker";
116
+ #multiProcessingModule = "worker";
117
logPerVirtualHost = true;
118
adminAddr = "eelco.dolstra@logicblox.com";
119
hostName = "localhost";
@@ -109,21 +122,14 @@ in
122
''
123
AddType application/nix-package .nixpkg
124
112
- <Location /server-status>
113
- SetHandler server-status
114
- Allow from 127.0.0.1 # If using a remote host for monitoring replace 127.0.0.1 with its IP.
115
- Order deny,allow
116
- Deny from all
117
- </Location>
125
+ #StartServers 15
126
127
ExtendedStatus On
120
-
121
- StartServers 15
128
'';
129
130
phpOptions =
131
''
126
- #max_execution_time = 2
132
+ ;max_execution_time = 2
133
memory_limit = "32M"
134
'';
135
@@ -217,13 +223,21 @@ in
223
};
224
225
users.extraUsers.tarball-mirror =
220
- { description = "Nixpkg starball mirroring user";
226
+ { description = "Nixpkgs tarball mirroring user";
227
home = "/home/tarball-mirror";
228
createHome = true;
229
useDefaultShell = true;
230
openssh.authorizedKeys.keys = singleton "ssh-dss AAAAB3NzaC1kc3MAAACBAOo3foMFsYvc+LEVVTAeXpaxdOFG6O2NE9coxZYN6UtwE477GwkvZ4uKymAekq3TB8I6dDg4QFfE27fIip/rQHJ/Rus+KsxwnTbwPzE0WcZVpkKQsepsoqLkfwMpiPfn5/oxcnJsimwRY/E95aJmmOHdGaYWrc0t4ARa+6teUgdFAAAAFQCSQq2Wil0/X4hDypGGUKlKvYyaWQAAAIAy/0fSDnz1tZOQBGq7q78y406HfWghErrVlrW9g+foJQG5pgXXcdJs9JCIrlaKivUKITDsYnQaCjrZaK8eHnc4ksbkSLfDOxFnR5814ulCftrgEDOv9K1UU3pYketjFMvQCA2U48lR6jG/99CPNXPH55QEFs8H97cIsdLQw9wM4gAAAIEAmzWZlXLzIf3eiHQggXqvw3+C19QvxQITcYHYVTx/XYqZi1VZ/fkY8bNmdcJsWFyOHgEhpEca+xM/SNvH/14rXDmt0wtclLEx/4GVLi59hQCnnKqv7HzJg8RF4v6XTiROBAEEdb4TaFuFn+JCvqPzilTzXTexvZKJECOvfYcY+10= eelco.dolstra@logicblox.com";
231
};
232
233
+ users.extraUsers.hydra-mirror =
234
+ { description = "Channel mirroring user";
235
+ home = "/home/hydra-mirror";
236
+ createHome = true;
237
+ useDefaultShell = true;
238
+ openssh.authorizedKeys.keys = singleton "ssh-dss AAAAB3NzaC1kc3MAAACBAOo3foMFsYvc+LEVVTAeXpaxdOFG6O2NE9coxZYN6UtwE477GwkvZ4uKymAekq3TB8I6dDg4QFfE27fIip/rQHJ/Rus+KsxwnTbwPzE0WcZVpkKQsepsoqLkfwMpiPfn5/oxcnJsimwRY/E95aJmmOHdGaYWrc0t4ARa+6teUgdFAAAAFQCSQq2Wil0/X4hDypGGUKlKvYyaWQAAAIAy/0fSDnz1tZOQBGq7q78y406HfWghErrVlrW9g+foJQG5pgXXcdJs9JCIrlaKivUKITDsYnQaCjrZaK8eHnc4ksbkSLfDOxFnR5814ulCftrgEDOv9K1UU3pYketjFMvQCA2U48lR6jG/99CPNXPH55QEFs8H97cIsdLQw9wM4gAAAIEAmzWZlXLzIf3eiHQggXqvw3+C19QvxQITcYHYVTx/XYqZi1VZ/fkY8bNmdcJsWFyOHgEhpEca+xM/SNvH/14rXDmt0wtclLEx/4GVLi59hQCnnKqv7HzJg8RF4v6XTiROBAEEdb4TaFuFn+JCvqPzilTzXTexvZKJECOvfYcY+10= eelco.dolstra@logicblox.com";
239
+ };
240
+
241
systemd.services.mirror-tarballs =
242
{ description = "Mirror Nixpkgs tarballs";
243
path = [ config.environment.nix pkgs.curl pkgs.git ];