Author: eelco
Date: Fri Oct 7 12:12:34 2011
New Revision: 29708
URL: https://nixos.org/websvn/nix/?rev=29708&sc=1
Log:
* Set X-Forwarded-Port if needed.
Modified:
configurations/trunk/tud/cartman.nix
Modified: configurations/trunk/tud/cartman.nix
==============================================================================
--- configurations/trunk/tud/cartman.nix Fri Oct 7 11:37:42 2011
(r29707)
+++ configurations/trunk/tud/cartman.nix Fri Oct 7 12:12:34 2011
(r29708)
@@ -66,20 +66,7 @@
'';
extraSubservices =
- [ { function = import /etc/nixos/services/subversion;
- id = "nix";
- urlPrefix = "";
- toplevelRedirect = false;
- dataDir = "/data/subversion-nix";
- notificationSender = "[email protected]";
- userCreationDomain = "st.ewi.tudelft.nl";
- organisation = {
- name = "Nix";
- url = http://nixos.org/;
- logo = "/logo/nixos-lores.png";
- };
- }
- { serviceType = "mediawiki";
+ [ { serviceType = "mediawiki";
siteName = "Nix Wiki";
logo = "/logo/nix-wiki.png";
defaultSkin = "nixos";
@@ -286,7 +273,24 @@
''
SSLCertificateChainFile /root/ssl-secrets/startssl-class1.pem
SSLCACertificateFile /root/ssl-secrets/startssl-ca.pem
+ # Required by Catalyst.
+ RequestHeader set X-Forwarded-Port 443
'';
+ extraSubservices = nixosVHostConfig.extraSubservices ++
+ [ { function = import /etc/nixos/services/subversion;
+ id = "nix";
+ urlPrefix = "";
+ toplevelRedirect = false;
+ dataDir = "/data/subversion-nix";
+ notificationSender = "[email protected]";
+ userCreationDomain = "st.ewi.tudelft.nl";
+ organisation = {
+ name = "Nix";
+ url = http://nixos.org/;
+ logo = "/logo/nixos-lores.png";
+ };
+ }
+ ];
})
{ hostName = "buildfarm.st.ewi.tudelft.nl";
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
