* Set X-Forwarded-Port if needed.
svn path=/configurations/trunk/tud/; revision=29708
Eelco Dolstra committed
Oct 7, 2011 at 12:12 UTC
d05c934310c6db9a8d11dbb7c56672f8b90385c5
1 file changed
+18
-14
cartman.nix
+18
-14
@@ -66,20 +66,7 @@ let
66
'';
67
68
extraSubservices =
69
- [ { function = import /etc/nixos/services/subversion;
70
- id = "nix";
71
- urlPrefix = "";
72
- toplevelRedirect = false;
73
- dataDir = "/data/subversion-nix";
74
- notificationSender = "svn@svn.nixos.org";
75
- userCreationDomain = "st.ewi.tudelft.nl";
76
- organisation = {
77
- name = "Nix";
78
- url = http://nixos.org/;
79
- logo = "/logo/nixos-lores.png";
80
- };
81
- }
82
- { serviceType = "mediawiki";
69
+ [ { serviceType = "mediawiki";
70
siteName = "Nix Wiki";
71
logo = "/logo/nix-wiki.png";
72
defaultSkin = "nixos";
@@ -286,7 +273,24 @@ rec {
273
''
274
SSLCertificateChainFile /root/ssl-secrets/startssl-class1.pem
275
SSLCACertificateFile /root/ssl-secrets/startssl-ca.pem
276
+ # Required by Catalyst.
277
+ RequestHeader set X-Forwarded-Port 443
278
'';
279
+ extraSubservices = nixosVHostConfig.extraSubservices ++
280
+ [ { function = import /etc/nixos/services/subversion;
281
+ id = "nix";
282
+ urlPrefix = "";
283
+ toplevelRedirect = false;
284
+ dataDir = "/data/subversion-nix";
285
+ notificationSender = "svn@svn.nixos.org";
286
+ userCreationDomain = "st.ewi.tudelft.nl";
287
+ organisation = {
288
+ name = "Nix";
289
+ url = http://nixos.org/;
290
+ logo = "/logo/nixos-lores.png";
291
+ };
292
+ }
293
+ ];
294
})
295
296
{ hostName = "buildfarm.st.ewi.tudelft.nl";