Remove nixos.org configuration from cartman.nix
Eelco Dolstra committed
Jun 7, 2013 at 10:51 UTC
39510dc75f16d2e74a1cd5c33dc0e8d405aa9ed3
1 file changed
+1
-157
delft/cartman.nix
+1
-157
@@ -27,15 +27,9 @@ let
27
time duplicity --full-if-older-than 30D --no-encryption /data/pt-wiki file:///backup/cartman/pt-wiki
28
time duplicity --no-encryption --force remove-all-inc-of-but-n-full 1 file:///backup/cartman/pt-wiki
29
30
- time duplicity --full-if-older-than 30D --no-encryption /data/nixos-mediawiki-upload file:///backup/cartman/nixos-mediawiki-upload
31
- time duplicity --no-encryption --force remove-all-inc-of-but-n-full 1 file:///backup/cartman/nixos-mediawiki-upload
32
-
30
time duplicity --full-if-older-than 30D --no-encryption /data/subversion file:///backup/cartman/subversion
31
time duplicity --no-encryption --force remove-all-inc-of-but-n-full 1 file:///backup/cartman/subversion
32
36
- time duplicity --full-if-older-than 30D --no-encryption /data/subversion-nix file:///backup/cartman/subversion-nix
37
- time duplicity --no-encryption --force remove-all-inc-of-but-n-full 1 file:///backup/cartman/subversion-nix
38
-
33
time duplicity --full-if-older-than 30D --no-encryption /data/subversion-ptg file:///backup/cartman/subversion-ptg
34
time duplicity --no-encryption --force remove-all-inc-of-but-n-full 1 file:///backup/cartman/subversion-ptg
35
@@ -66,98 +60,6 @@ let
60
rev = 94;
61
};
62
69
- nixosVHostConfig =
70
- { hostName = "nixos.org";
71
- serverAliases = [ "ipv6.nixos.org" ];
72
- documentRoot = "/home/eelco/nix-homepage";
73
- enableUserDir = true;
74
- servedDirs =
75
- [ { urlPath = "/tarballs";
76
- dir = "/data/webserver/tarballs";
77
- }
78
- { urlPath = "/irc";
79
- dir = "/data/webserver/irc";
80
- }
81
- { urlPath = "/update";
82
- dir = "/data/webserver/update";
83
- }
84
- # Backwards compatibility.
85
- { urlPath = "/releases/nixpkgs/channels";
86
- dir = "/data/releases/channels";
87
- }
88
- # Backwards compatibility.
89
- { urlPath = "/releases/nixos/channels";
90
- dir = "/data/releases/channels";
91
- }
92
- { urlPath = "/channels";
93
- dir = "/data/releases/channels";
94
- }
95
- { urlPath = "/releases";
96
- dir = "/data/releases";
97
- }
98
- { urlPath = "/binary-cache";
99
- dir = "/data/releases/binary-cache";
100
- }
101
- ];
102
-
103
- servedFiles =
104
- [ { urlPath = "/releases/css/releases.css";
105
- file = releasesCSS;
106
- }
107
- ];
108
-
109
- extraConfig =
110
- ''
111
- <Proxy *>
112
- Order deny,allow
113
- Allow from all
114
- </Proxy>
115
-
116
- ProxyPreserveHost On
117
-
118
- ProxyPass /mturk http://wendy:3000/mturk retry=5
119
- ProxyPassReverse /mturk http://wendy:3000/mturk
120
- ProxyPass /mturk-sandbox http://wendy:3001/mturk-sandbox retry=5
121
- ProxyPassReverse /mturk-sandbox http://wendy:3001/mturk-sandbox
122
-
123
- MaxKeepAliveRequests 0
124
-
125
- # Use a very short error message for 404s in the binary
126
- # cache, since those are very frequent and not generally
127
- # seen by humans.
128
- <Location /releases/binary-cache>
129
- ErrorDocument 404 "No such file."
130
- </Location>
131
- '';
132
-
133
- extraSubservices =
134
- [ { serviceType = "mediawiki";
135
- siteName = "Nix Wiki";
136
- logo = "/logo/nix-wiki.png";
137
- #defaultSkin = "nixos";
138
- skins = [ ./wiki-skins ];
139
- extraConfig =
140
- ''
141
- #$wgEmailConfirmToEdit = true;
142
-
143
- # Use a reCAPTCHA to prevent spam.
144
- require_once("$IP/extensions/ConfirmEdit/ConfirmEdit.php");
145
- require_once("$IP/extensions/ConfirmEdit/ReCaptcha.php");
146
- $wgCaptchaClass = 'ReCaptcha';
147
- $wgReCaptchaPublicKey = '6Ldevd8SAAAAAFR6MwnU01FOWJ3O4II3aRJpMQ8F';
148
- $wgReCaptchaPrivateKey = '${builtins.readFile ./nixos.org-recaptcha-private-key}';
149
- $wgCaptchaTriggers['edit'] = true;
150
- $wgCaptchaTriggers['create'] = true;
151
- '';
152
- enableUploads = true;
153
- uploadDir = "/data/nixos-mediawiki-upload";
154
- dbServer = "wendy";
155
- dbUser = "mediawiki";
156
- dbPassword = import ./mediawiki-password.nix;
157
- }
158
- ];
159
- };
160
-
63
strategoxtVHostConfig =
64
{ hostName = "strategoxt.org";
65
servedFiles = [
@@ -205,11 +107,6 @@ rec {
107
{ label = "nixos";
108
options = "acl";
109
};
208
- fileSystems."/data/releases" =
209
- { device = "192.168.1.25:/";
210
- fsType = "nfs4";
211
- options = "soft";
212
- };
110
fileSystems."/backup" =
111
{ device = "130.161.158.5:/dxs/users4/group/buildfarm";
112
fsType = "nfs4";
@@ -374,39 +271,10 @@ rec {
271
virtualHosts = [
272
273
{ # Catch-all site.
377
- hostName = "www.nixos.org";
274
+ hostName = "old.nixos.org";
275
globalRedirect = "http://nixos.org/";
276
}
277
381
- nixosVHostConfig
382
-
383
- (nixosVHostConfig // {
384
- enableSSL = true;
385
- sslServerCert = "/root/ssl-secrets/ssl-nixos-org.crt";
386
- sslServerKey = "/root/ssl-secrets/ssl-nixos-org.key";
387
- extraConfig = nixosVHostConfig.extraConfig +
388
- ''
389
- SSLCertificateChainFile /root/ssl-secrets/startssl-class1.pem
390
- SSLCACertificateFile /root/ssl-secrets/startssl-ca.pem
391
- # Required by Catalyst.
392
- RequestHeader set X-Forwarded-Port 443
393
- '';
394
- extraSubservices = nixosVHostConfig.extraSubservices ++
395
- [ { function = import /etc/nixos/services/subversion;
396
- id = "nix";
397
- urlPrefix = "";
398
- toplevelRedirect = false;
399
- dataDir = "/data/subversion-nix";
400
- notificationSender = "svn@svn.nixos.org";
401
- organisation = {
402
- name = "Nix";
403
- url = http://nixos.org/;
404
- logo = "/logo/nixos-lores.png";
405
- };
406
- }
407
- ];
408
- })
409
-
278
{ hostName = "buildfarm.st.ewi.tudelft.nl";
279
documentRoot = cleanSource ./webroot;
280
enableUserDir = true;
@@ -518,22 +386,6 @@ rec {
386
];
387
}
388
521
- # Obsolete, kept for backwards compatibility.
522
- { hostName = "svn.nixos.org";
523
- enableSSL = true;
524
- sslServerCert = "/root/ssl-secrets/server.crt";
525
- sslServerKey = "/root/ssl-secrets/server.key";
526
- extraConfig = ''
527
- RedirectMatch permanent ^/$ https://nixos.org/repoman
528
- Redirect permanent / https://nixos.org/
529
- '';
530
- }
531
-
532
- # Obsolete, kept for backwards compatibility.
533
- { hostName = "svn.nixos.org";
534
- globalRedirect = "https://nixos.org/repoman";
535
- }
536
-
389
{ hostName = "hydra.nixos.org";
390
logFormat = ''"%h %l %u %t \"%r\" %>s %b %D"'';
391
extraConfig = ''
@@ -590,14 +442,6 @@ rec {
442
'';
443
}
444
593
- # Obsolete, kept for backwards compatibility.
594
- { hostName = "wiki.nixos.org";
595
- extraConfig = ''
596
- RedirectMatch ^/$ https://nixos.org/wiki
597
- Redirect / https://nixos.org/
598
- '';
599
- }
600
-
445
{ hostName = "planet.strategoxt.org";
446
serverAliases = ["planet.stratego.org"];
447
documentRoot = "/home/karltk/public_html/planet";