svn path=/configurations/trunk/tud/; revision=12027
svn path=/configurations/trunk/tud/; revision=12027
Eelco Dolstra committed
Jun 9, 2008 at 16:49 UTC
a7f501621e1e6b87abe2fa83c729b2fa506a0b44
1 file changed
+47
-59
cartman.nix
+47
-59
@@ -209,13 +209,6 @@ rec {
209
Order deny,allow
210
Allow from all
211
</Location>
212
-
213
- Alias /zabbix ${pkgs.zabbixServer}/share/zabbix/php
214
- <Directory ${pkgs.zabbixServer}/share/zabbix/php>
215
- DirectoryIndex index.php
216
- Order deny,allow
217
- Allow from *
218
- </Directory>
212
'';
213
214
servedFiles = [
@@ -235,34 +228,33 @@ rec {
228
{ hostName = "buildfarm.st.ewi.tudelft.nl";
229
documentRoot = pkgs.lib.cleanSource ./webroot;
230
extraSubservices = [
238
- { function = import /etc/nixos/nixos/upstart-jobs/apache-httpd/subversion.nix;
239
- config = {
240
- urlPrefix = "";
241
- toplevelRedirect = false;
242
- dataDir = "/data/subversion";
243
- notificationSender = "svn@buildfarm.st.ewi.tudelft.nl";
244
- userCreationDomain = "st.ewi.tudelft.nl";
245
- organisation = {
246
- name = "Software Engineering Research Group, TU Delft";
247
- url = http://www.st.ewi.tudelft.nl/;
248
- logo = "/serg-logo.png";
249
- };
231
+ { serviceType = "subversion";
232
+ urlPrefix = "";
233
+ toplevelRedirect = false;
234
+ dataDir = "/data/subversion";
235
+ notificationSender = "svn@buildfarm.st.ewi.tudelft.nl";
236
+ userCreationDomain = "st.ewi.tudelft.nl";
237
+ organisation = {
238
+ name = "Software Engineering Research Group, TU Delft";
239
+ url = http://www.st.ewi.tudelft.nl/;
240
+ logo = "/serg-logo.png";
241
};
242
}
252
- { function = import /etc/nixos/nixos/upstart-jobs/apache-httpd/subversion.nix;
253
- config = {
254
- id = "ptg";
255
- urlPrefix = "/ptg";
256
- dataDir = "/data/subversion-ptg";
257
- notificationSender = "svn@buildfarm.st.ewi.tudelft.nl";
258
- userCreationDomain = "st.ewi.tudelft.nl";
259
- organisation = {
260
- name = "Software Engineering Research Group, TU Delft";
261
- url = http://www.st.ewi.tudelft.nl/;
262
- logo = "/serg-logo.png";
263
- };
243
+ { serviceType = "subversion";
244
+ id = "ptg";
245
+ urlPrefix = "/ptg";
246
+ dataDir = "/data/subversion-ptg";
247
+ notificationSender = "svn@buildfarm.st.ewi.tudelft.nl";
248
+ userCreationDomain = "st.ewi.tudelft.nl";
249
+ organisation = {
250
+ name = "Software Engineering Research Group, TU Delft";
251
+ url = http://www.st.ewi.tudelft.nl/;
252
+ logo = "/serg-logo.png";
253
};
254
}
255
+ { serviceType = "zabbix";
256
+ urlPrefix = "/zabbix";
257
+ }
258
];
259
servedDirs = [
260
{ urlPath = "/releases";
@@ -281,8 +273,8 @@ rec {
273
274
{ hostName = "strategoxt.org";
275
extraSubservices = [
284
- { function = import /etc/nixos/nixos/upstart-jobs/apache-httpd/twiki.nix;
285
- config = { startWeb = "Stratego/WebHome"; };
276
+ { serviceType = "twiki";
277
+ startWeb = "Stratego/WebHome";
278
}
279
];
280
}
@@ -299,18 +291,16 @@ rec {
291
{ hostName = "svn.strategoxt.org";
292
enableSSL = true;
293
extraSubservices = [
302
- { function = import /etc/nixos/nixos/upstart-jobs/apache-httpd/subversion.nix;
303
- config = {
304
- id = "strategoxt";
305
- urlPrefix = "";
306
- dataDir = "/data/subversion-strategoxt";
307
- notificationSender = "svn@svn.strategoxt.org";
308
- userCreationDomain = "st.ewi.tudelft.nl";
309
- organisation = {
310
- name = "Stratego/XT";
311
- url = http://strategoxt.org/;
312
- logo = http://strategoxt.org/pub/Stratego/StrategoLogo/StrategoLogoTextlessWhite-100px.png;
313
- };
294
+ { serviceType = "subversion";
295
+ id = "strategoxt";
296
+ urlPrefix = "";
297
+ dataDir = "/data/subversion-strategoxt";
298
+ notificationSender = "svn@svn.strategoxt.org";
299
+ userCreationDomain = "st.ewi.tudelft.nl";
300
+ organisation = {
301
+ name = "Stratego/XT";
302
+ url = http://strategoxt.org/;
303
+ logo = http://strategoxt.org/pub/Stratego/StrategoLogo/StrategoLogoTextlessWhite-100px.png;
304
};
305
}
306
];
@@ -319,8 +309,8 @@ rec {
309
{ hostName = "program-transformation.org";
310
serverAliases = ["www.program-transformation.org"];
311
extraSubservices = [
322
- { function = import /etc/nixos/nixos/upstart-jobs/apache-httpd/twiki.nix;
323
- config = { startWeb = "Transform/WebHome"; };
312
+ { serviceType = "twiki";
313
+ startWeb = "Transform/WebHome";
314
}
315
];
316
}
@@ -367,18 +357,16 @@ rec {
357
{ hostName = "svn.nixos.org";
358
enableSSL = true;
359
extraSubservices = [
370
- { function = import /etc/nixos/nixos/upstart-jobs/apache-httpd/subversion.nix;
371
- config = {
372
- id = "nix";
373
- urlPrefix = "";
374
- dataDir = "/data/subversion-nix";
375
- notificationSender = "svn@svn.nixos.org";
376
- userCreationDomain = "st.ewi.tudelft.nl";
377
- organisation = {
378
- name = "Nix";
379
- url = http://nixos.org/;
380
- logo = http://subversion.tigris.org/images/subversion_logo_hor-468x64.png; # !!! need a logo
381
- };
360
+ { serviceType = "subversion";
361
+ id = "nix";
362
+ urlPrefix = "";
363
+ dataDir = "/data/subversion-nix";
364
+ notificationSender = "svn@svn.nixos.org";
365
+ userCreationDomain = "st.ewi.tudelft.nl";
366
+ organisation = {
367
+ name = "Nix";
368
+ url = http://nixos.org/;
369
+ logo = http://subversion.tigris.org/images/subversion_logo_hor-468x64.png; # !!! need a logo
370
};
371
}
372
];