Really fix wiki redirect
Eelco Dolstra committed
May 9, 2017 at 17:08 UTC
b48e1e1438df7d1bd24f31aefdb991ad51769368
1 file changed
+3
-5
nixos-org/webserver.nix
+3
-5
@@ -40,7 +40,6 @@ let
40
''
41
MaxKeepAliveRequests 0
42
43
- Redirect /wiki https://nixos.org/nixos/wiki.html
43
Redirect /binary-cache http://cache.nixos.org
44
Redirect /releases/channels /channels
45
Redirect /tarballs http://tarballs.nixos.org
@@ -50,6 +49,8 @@ let
49
RewriteEngine on
50
RewriteRule "^(.*/)?\.git/" - [F,L]
51
52
+ RedirectMatch "^/wiki.*" "https://nixos.org/nixos/wiki.html"
53
+
54
<Location /server-status>
55
SetHandler server-status
56
Allow from 127.0.0.1
@@ -119,10 +120,7 @@ in
120
}
121
122
(nixosVHostConfig // {
122
- extraConfig = nixosVHostConfig.extraConfig +
123
- ''
124
- Redirect /wiki https://nixos.org/nixos/wiki.html
125
- '';
123
+ extraConfig = nixosVHostConfig.extraConfig;
124
})
125
126
(nixosVHostConfig // {