Remove www.nixos.org
It doesn't exist in DNS anymore and nobody complained (except the ACME renewal).
Eelco Dolstra committed
Jan 30, 2019 at 15:28 UTC
517cabda83b1e0678e39e4dd8c221308e547d8ca
1 file changed
+1
-33
nixos-org/webserver.nix
+1
-33
@@ -119,36 +119,10 @@ in
119
120
virtualHosts =
121
[ { # Catch-all site.
122
- hostName = "www.nixos.org";
122
+ hostName = "nixos.org";
123
globalRedirect = "https://nixos.org/";
124
}
125
126
- { # Catch-all site, SSL
127
- hostName = "www.nixos.org";
128
- globalRedirect = "https://nixos.org/";
129
-
130
- enableSSL = true;
131
- sslServerKey = "${acmeKeyDir}/www.nixos.org/key.pem";
132
- sslServerCert = "${acmeKeyDir}/www.nixos.org/fullchain.pem";
133
- extraConfig = nixosVHostConfig.extraConfig +
134
- ''
135
- Header always set Strict-Transport-Security "max-age=15552000"
136
- SSLProtocol All -SSLv2 -SSLv3
137
- SSLCipherSuite HIGH:!aNULL:!MD5:!EXP
138
- SSLHonorCipherOrder on
139
- '';
140
- servedDirs =
141
- [ { urlPath = "/.well-known/acme-challenge";
142
- dir = "${acmeWebRoot}/.well-known/acme-challenge";
143
- }
144
- ];
145
-
146
- }
147
-
148
- (nixosVHostConfig // {
149
- extraConfig = nixosVHostConfig.extraConfig;
150
- })
151
-
126
(nixosVHostConfig // {
127
enableSSL = true;
128
sslServerKey = "${acmeKeyDir}/nixos.org/key.pem";
@@ -283,11 +257,6 @@ in
257
webroot = "${acmeWebRoot}";
258
postRun = "systemctl reload httpd.service";
259
};
286
- "www.nixos.org" =
287
- { email = "edolstra@gmail.com";
288
- webroot = "${acmeWebRoot}";
289
- postRun = "systemctl reload httpd.service";
290
- };
260
};
261
262
# Generate a dummy self-signed certificate until we get one from
@@ -311,7 +280,6 @@ in
280
''
281
${mkKeys "${acmeKeyDir}/nixos.org"}
282
${mkKeys "${acmeKeyDir}/planet.nixos.org"}
314
- ${mkKeys "${acmeKeyDir}/www.nixos.org"}
283
'';
284
285
}