Skip to content
This repository has been archived by the owner on Aug 26, 2022. It is now read-only.

Commit

Permalink
Merge pull request #4164 from jwhitlock/all-servers-1352232
Browse files Browse the repository at this point in the history
bug 1352232 - Duplicate all-servers.conf outside Ansible provisioning
  • Loading branch information
jwhitlock committed Apr 3, 2017
2 parents e9707cf + 67ea38b commit d0b0284
Show file tree
Hide file tree
Showing 2 changed files with 117 additions and 4 deletions.
111 changes: 111 additions & 0 deletions etc/apache/all-servers.conf
@@ -0,0 +1,111 @@
# WARNING: Do not move this file
#
# Our servers symlink to this file. Do not move it without first coordinating
# with WebOps.

# Bug 1078186 - Redirect old static canvas examples to wiki pages
# canvas tutorial
RewriteRule ^/samples/canvas-tutorial/2_1_canvas_rect.html$ /docs/Web/API/Canvas_API/Tutorial/Drawing_shapes#Rectangular_shape_example [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/2_2_canvas_moveto.html$ /docs/Web/API/Canvas_API/Tutorial/Drawing_shapes#Moving_the_pen [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/2_3_canvas_lineto.html$ /docs/Web/API/Canvas_API/Tutorial/Drawing_shapes#Lines [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/2_4_canvas_arc.html$ /docs/Web/API/Canvas_API/Tutorial/Drawing_shapes#Arcs [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/2_5_canvas_quadraticcurveto.html$ /docs/Web/API/Canvas_API/Tutorial/Drawing_shapes#Quadratic_Bezier_curves [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/2_6_canvas_beziercurveto.html$ /docs/Web/API/Canvas_API/Tutorial/Drawing_shapes#Cubic_Bezier_curves [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/3_1_canvas_drawimage.html$ /docs/Web/API/Canvas_API/Tutorial/Using_images#Drawing_images [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/3_2_canvas_drawimage.html$ /docs/Web/API/Canvas_API/Tutorial/Using_images#Example.3A_Tiling_an_image [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/3_3_canvas_drawimage.html$ /docs/Web/API/Canvas_API/Tutorial/Using_images#Example.3A_Framing_an_image [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/3_4_canvas_gallery.html$ /docs/Web/API/Canvas_API/Tutorial/Using_images#Art_gallery_example [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/4_1_canvas_fillstyle.html$ /docs/Web/API/CanvasRenderingContext2D.fillStyle [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/4_2_canvas_strokestyle.html$ /docs/Web/API/CanvasRenderingContext2D.strokeStyle [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/4_3_canvas_globalalpha.html$ /docs/Web/API/CanvasRenderingContext2D.globalAlpha [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/4_4_canvas_rgba.html$ /docs/Web/API/Canvas_API/Tutorial/Applying_styles_and_colors#An_example_using_rgba() [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/4_5_canvas_linewidth.html$ /docs/Web/API/Canvas_API/Tutorial/Applying_styles_and_colors#A_lineWidth_example [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/4_6_canvas_linecap.html$ /docs/Web/API/CanvasRenderingContext2D.lineCap [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/4_7_canvas_linejoin.html$ /docs/Web/API/CanvasRenderingContext2D.lineJoin [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/4_8_canvas_miterlimit.html$ /docs/Web/API/CanvasRenderingContext2D.miterLimit [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/4_9_canvas_lineargradient.html$ /docs/Web/API/Canvas_API/Tutorial/Applying_styles_and_colors#A_createLinearGradient_example [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/4_10_canvas_radialgradient.html$ /docs/Web/API/Canvas_API/Tutorial/Applying_styles_and_colors#A_createRadialGradient_example [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/4_11_canvas_createpattern.html$ /docs/Web/API/CanvasRenderingContext2D.createPattern [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/5_1_canvas_savestate.html$ /docs/Web/API/Canvas_API/Tutorial/Transformations#A_save_and_restore_canvas_state_example [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/5_2_canvas_translate.html$ /docs/Web/API/CanvasRenderingContext2D.translate [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/5_3_canvas_rotate.html$ /docs/Web/API/CanvasRenderingContext2D.rotate [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/5_4_canvas_scale.html$ /docs/Web/API/CanvasRenderingContext2D.scale [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/6_1_canvas_composite.html$ /docs/Web/API/CanvasRenderingContext2D.globalCompositeOperation [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/6_2_canvas_clipping.html$ /docs/Web/API/Canvas_API/Tutorial/Compositing#Clipping_paths [NE,R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/globalCompositeOperation.html$ /docs/Web/API/CanvasRenderingContext2D.globalCompositeOperation [R=301,L,NC]
# canvas images
RewriteRule ^/samples/canvas-tutorial/images/backdrop.png$ https://mdn.mozillademos.org/files/5395/backdrop.png [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/images/bg_gallery.png$ https://mdn.mozillademos.org/files/5415/bg_gallery.png [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/images/gallery_1.jpg$ https://mdn.mozillademos.org/files/5399/gallery_1.jpg [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/images/gallery_2.jpg$ https://mdn.mozillademos.org/files/5401/gallery_2.jpg [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/images/gallery_3.jpg$ https://mdn.mozillademos.org/files/5403/gallery_3.jpg [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/images/gallery_4.jpg$ https://mdn.mozillademos.org/files/5405/gallery_4.jpg [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/images/gallery_5.jpg$ https://mdn.mozillademos.org/files/5407/gallery_5.jpg [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/images/gallery_6.jpg$ https://mdn.mozillademos.org/files/5409/gallery_6.jpg [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/images/gallery_7.jpg$ https://mdn.mozillademos.org/files/5411/gallery_7.jpg [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/images/gallery_8.jpg$ https://mdn.mozillademos.org/files/5413/gallery_8.jpg [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/images/picture_frame.png$ https://mdn.mozillademos.org/files/242/Canvas_picture_frame.png [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/images/rhino.jpg$ https://mdn.mozillademos.org/files/5397/rhino.jpg [R=301,L,NC]
RewriteRule ^/samples/canvas-tutorial/images/wallpaper.png$ https://mdn.mozillademos.org/files/222/Canvas_createpattern.png [R=301,L,NC]
# canvas example in samples/domref
RewriteRule ^/samples/domref/mozGetAsFile.html$ /docs/Web/API/HTMLCanvasElement.mozGetAsFile [R=301,L,NC]
# canvas raycaster
RewriteRule ^/samples/raycaster/input.js$ http://mdn.github.io/canvas-raycaster/input.js [R=301,L,NC]
RewriteRule ^/samples/raycaster/Level.js$ http://mdn.github.io/canvas-raycaster/Level.js [R=301,L,NC]
RewriteRule ^/samples/raycaster/Player.js$ http://mdn.github.io/canvas-raycaster/Player.js [R=301,L,NC]
RewriteRule ^/samples/raycaster/RayCaster.html$ http://mdn.github.io/canvas-raycaster/index.html [R=301,L,NC]
RewriteRule ^/samples/raycaster/RayCaster.js$ http://mdn.github.io/canvas-raycaster/RayCaster.js [R=301,L,NC]
RewriteRule ^/samples/raycaster/trace.css$ http://mdn.github.io/canvas-raycaster/trace.css [R=301,L,NC]
RewriteRule ^/samples/raycaster/trace.js$ http://mdn.github.io/canvas-raycaster/trace.js [R=301,L,NC]

# Bug 1215255 - Redirect static WebGL examples
RewriteRule ^/samples/webgl/sample1$ http://mdn.github.io/webgl-examples/tutorial/sample1 [R=301,L,NC]
RewriteRule ^/samples/webgl/sample1/index.html$ http://mdn.github.io/webgl-examples/tutorial/sample1/index.html [R=301,L,NC]
RewriteRule ^/samples/webgl/sample1/webgl-demo.js$ http://mdn.github.io/webgl-examples/tutorial/sample1/webgl-demo.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample1/webgl.css$ http://mdn.github.io/webgl-examples/tutorial/webgl.css [R=301,L,NC]
RewriteRule ^/samples/webgl/sample2$ http://mdn.github.io/webgl-examples/tutorial/sample2 [R=301,L,NC]
RewriteRule ^/samples/webgl/sample2/glUtils.js$ http://mdn.github.io/webgl-examples/tutorial/glUtils.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample2/index.html$ http://mdn.github.io/webgl-examples/tutorial/sample2/index.html [R=301,L,NC]
RewriteRule ^/samples/webgl/sample2/sylvester.js$ http://mdn.github.io/webgl-examples/tutorial/sylvester.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample2/webgl-demo.js$ http://mdn.github.io/webgl-examples/tutorial/sample2/webgl-demo.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample2/webgl.css$ http://mdn.github.io/webgl-examples/tutorial/webgl.css [R=301,L,NC]
RewriteRule ^/samples/webgl/sample3$ http://mdn.github.io/webgl-examples/tutorial/sample3 [R=301,L,NC]
RewriteRule ^/samples/webgl/sample3/glUtils.js$ http://mdn.github.io/webgl-examples/tutorial/glUtils.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample3/index.html$ http://mdn.github.io/webgl-examples/tutorial/sample3/index.html [R=301,L,NC]
RewriteRule ^/samples/webgl/sample3/sylvester.js$ http://mdn.github.io/webgl-examples/tutorial/sylvester.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample3/webgl-demo.js$ http://mdn.github.io/webgl-examples/tutorial/sample3/webgl-demo.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample3/webgl.css$ http://mdn.github.io/webgl-examples/tutorial/webgl.css [R=301,L,NC]
RewriteRule ^/samples/webgl/sample4$ http://mdn.github.io/webgl-examples/tutorial/sample4 [R=301,L,NC]
RewriteRule ^/samples/webgl/sample4/glUtils.js$ http://mdn.github.io/webgl-examples/tutorial/glUtils.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample4/index.html$ http://mdn.github.io/webgl-examples/tutorial/sample4/index.html [R=301,L,NC]
RewriteRule ^/samples/webgl/sample4/sylvester.js$ http://mdn.github.io/webgl-examples/tutorial/sylvester.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample4/webgl-demo.js$ http://mdn.github.io/webgl-examples/tutorial/sample4/webgl-demo.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample4/webgl.css$ http://mdn.github.io/webgl-examples/tutorial/webgl.css [R=301,L,NC]
RewriteRule ^/samples/webgl/sample5$ http://mdn.github.io/webgl-examples/tutorial/sample5 [R=301,L,NC]
RewriteRule ^/samples/webgl/sample5/glUtils.js$ http://mdn.github.io/webgl-examples/tutorial/glUtils.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample5/index.html$ http://mdn.github.io/webgl-examples/tutorial/sample5/index.html [R=301,L,NC]
RewriteRule ^/samples/webgl/sample5/sylvester.js$ http://mdn.github.io/webgl-examples/tutorial/sylvester.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample5/webgl-demo.js$ http://mdn.github.io/webgl-examples/tutorial/sample5/webgl-demo.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample5/webgl.css$ http://mdn.github.io/webgl-examples/tutorial/webgl.css [R=301,L,NC]
RewriteRule ^/samples/webgl/sample6$ http://mdn.github.io/webgl-examples/tutorial/sample6 [R=301,L,NC]
RewriteRule ^/samples/webgl/sample6/cubetexture.png$ http://mdn.github.io/webgl-examples/tutorial/sample6/cubetexture.png [R=301,L,NC]
RewriteRule ^/samples/webgl/sample6/glUtils.js$ http://mdn.github.io/webgl-examples/tutorial/glUtils.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample6/index.html$ http://mdn.github.io/webgl-examples/tutorial/sample6/index.html [R=301,L,NC]
RewriteRule ^/samples/webgl/sample6/sylvester.js$ http://mdn.github.io/webgl-examples/tutorial/sylvester.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample6/webgl-demo.js$ http://mdn.github.io/webgl-examples/tutorial/sample6/webgl-demo.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample6/webgl.css$ http://mdn.github.io/webgl-examples/tutorial/webgl.css [R=301,L,NC]
RewriteRule ^/samples/webgl/sample7$ http://mdn.github.io/webgl-examples/tutorial/sample7 [R=301,L,NC]
RewriteRule ^/samples/webgl/sample7/cubetexture.png$ http://mdn.github.io/webgl-examples/tutorial/sample7/cubetexture.png [R=301,L,NC]
RewriteRule ^/samples/webgl/sample7/glUtils.js$ http://mdn.github.io/webgl-examples/tutorial/glUtils.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample7/index.html$ http://mdn.github.io/webgl-examples/tutorial/sample7/index.html [R=301,L,NC]
RewriteRule ^/samples/webgl/sample7/sylvester.js$ http://mdn.github.io/webgl-examples/tutorial/sylvester.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample7/webgl-demo.js$ http://mdn.github.io/webgl-examples/tutorial/sample7/webgl-demo.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample7/webgl.css$ http://mdn.github.io/webgl-examples/tutorial/webgl.css [R=301,L,NC]
RewriteRule ^/samples/webgl/sample8$ http://mdn.github.io/webgl-examples/tutorial/sample8 [R=301,L,NC]
RewriteRule ^/samples/webgl/sample8/Firefox.ogv$ http://mdn.github.io/webgl-examples/tutorial/sample8/Firefox.ogv [R=301,L,NC]
RewriteRule ^/samples/webgl/sample8/glUtils.js$ http://mdn.github.io/webgl-examples/tutorial/glUtils.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample8/index.html$ http://mdn.github.io/webgl-examples/tutorial/sample8/index.html [R=301,L,NC]
RewriteRule ^/samples/webgl/sample8/sylvester.js$ http://mdn.github.io/webgl-examples/tutorial/sylvester.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample8/webgl-demo.js$ http://mdn.github.io/webgl-examples/tutorial/sample8/webgl-demo.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample8/webgl.css$ http://mdn.github.io/webgl-examples/tutorial/webgl.css [R=301,L,NC]

10 changes: 6 additions & 4 deletions provisioning/roles/kuma/files/apache2/all-servers.conf
@@ -1,7 +1,9 @@
# WARNING: Do not move this file
# Legacy version of this file. Servers need to be updated to symlink to the
# file at:
#
# Our servers symlink to this file. Do not move it without first coordinating
# with WebOps.
# etc/apache/all-servers.conf
#
# Once the symlink is changed, this file can be removed.

# Bug 1078186 - Redirect old static canvas examples to wiki pages
# canvas tutorial
Expand Down Expand Up @@ -107,4 +109,4 @@ RewriteRule ^/samples/webgl/sample8/glUtils.js$ http://mdn.github.io/webgl-
RewriteRule ^/samples/webgl/sample8/index.html$ http://mdn.github.io/webgl-examples/tutorial/sample8/index.html [R=301,L,NC]
RewriteRule ^/samples/webgl/sample8/sylvester.js$ http://mdn.github.io/webgl-examples/tutorial/sylvester.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample8/webgl-demo.js$ http://mdn.github.io/webgl-examples/tutorial/sample8/webgl-demo.js [R=301,L,NC]
RewriteRule ^/samples/webgl/sample8/webgl.css$ http://mdn.github.io/webgl-examples/tutorial/webgl.css [R=301,L,NC]
RewriteRule ^/samples/webgl/sample8/webgl.css$ http://mdn.github.io/webgl-examples/tutorial/webgl.css [R=301,L,NC]

0 comments on commit d0b0284

Please sign in to comment.