From 9eff19fb439f9dfe47675baadba0cdd0af220b55 Mon Sep 17 00:00:00 2001
From: Jeremy Edberg <jedberg@reddit.com>
Date: Wed, 24 Sep 2008 10:30:43 -0700
Subject: [PATCH] update our static file handling to be more efficient and
 reduce server load

---
 r2/r2/config/rewrites.py                       |   6 +-----
 r2/r2/public/akamai-sureroute-test-object.html |   1 +
 r2/r2/public/apple-touch-icon.png              |   1 +
 r2/r2/public/favicon.ico                       | Bin 3639 -> 18 bytes
 r2/r2/public/robots.txt                        |   1 +
 5 files changed, 4 insertions(+), 5 deletions(-)
 create mode 120000 r2/r2/public/akamai-sureroute-test-object.html
 create mode 120000 r2/r2/public/apple-touch-icon.png
 mode change 100644 => 120000 r2/r2/public/favicon.ico
 create mode 120000 r2/r2/public/robots.txt

diff --git a/r2/r2/config/rewrites.py b/r2/r2/config/rewrites.py
index 8aa5d007d..625fbd17c 100644
--- a/r2/r2/config/rewrites.py
+++ b/r2/r2/config/rewrites.py
@@ -26,10 +26,6 @@ rewrites = (#these first two rules prevent the .embed rewrite from
             ("^/_(.*)", "/_$1"),
             ("^/static/(.*\.js)", "/static/$1"),
             #This next rewrite makes it so that all the embed stuff works.
-            ("^(.*)(?<!button)(\.js)$", "$1.embed"),
-            ("^/favicon.ico$", "/static/favicon.ico"),
-            ("^/robots.txt$", "/static/robots.txt"),
-            ("^/akamai-sureroute-test-object.html$", "/static/sureroute.html"),
-            ("^/apple-touch-icon.png$", "/static/apple-touch-icon.png"))
+            ("^(.*)(?<!button)(\.js)$", "$1.embed"))
 
 rewrites = tuple((re.compile(r[0]), r[1]) for r in rewrites)
diff --git a/r2/r2/public/akamai-sureroute-test-object.html b/r2/r2/public/akamai-sureroute-test-object.html
new file mode 120000
index 000000000..cca04d2b7
--- /dev/null
+++ b/r2/r2/public/akamai-sureroute-test-object.html
@@ -0,0 +1 @@
+static/sureroute.html
\ No newline at end of file
diff --git a/r2/r2/public/apple-touch-icon.png b/r2/r2/public/apple-touch-icon.png
new file mode 120000
index 000000000..4f64aa176
--- /dev/null
+++ b/r2/r2/public/apple-touch-icon.png
@@ -0,0 +1 @@
+static/apple-touch-icon.png
\ No newline at end of file
diff --git a/r2/r2/public/favicon.ico b/r2/r2/public/favicon.ico
deleted file mode 100644
index 738332d280d915cafe46848f0abc5bcd0523dfc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3639
zcmeHJd036x8vm72lq8)fQW_jGMC^o)a5`m7p&~YEm(oC}46&sUDH*m7LOXS|4JBhb
zrjyjI8>PXJ+De&aY-`-D@2u}j=eV5b+&}Ig_x^F;=ULx+r*FOQTHm{V?*}MA5t^Fd
z$VV9%KsiIhc3Gkd?4-JZRAgOPwF0P;(gX!=`sTqf3?|wVoIDtb*$z{Ye2k#F;5@o(
z5`?Yt#;rmEOY=cEd+t2Qt2^-WA=nzZ9cA|(Am{W!2)vfy>GKzeKXe2PQ;V$Z92l7p
z#7C_~epV{RT8~Hl!yE8j=!D@G1j_?gK-N%?OG&#BEnJQh$0bNVOJjwFVwJB4@^2N<
zH3;|%7GSsNXB1vag1x;x?q{FEGzWsr%hzBrl85;&PH26c52m3KiAle}&y$b6n}gBV
zMDVck5#E+v!REEg5EB!H^n{)8_wz+sS{jOqOA!+259a+nB<<gZ@Q4Vk^IwGb@882=
zsvT-;YmtBX7#6y@AS`q>mMor+0AEkEJh}<5`LhtZ+!Kk3Vvr}dAk8}iSz`-GYc<jj
zMZtTaGxkTW#(cgz3JMCaZG9llC&s|r%M(|wT?ctniUw&8Rt7G^#*G_sBK0&qv*%b7
zAi&#u*AeWy2;mz-aUg0v!h@Hhq@)DN$;lwK`6$dh2GaBh8&-H>)22;GI~<L}M-tH7
zLcn}{0O6{o_*9vV)&7gIZ%YWs>k^O`Mez6c$I2CfxR?}+Dw=Nr-5VkF9r<H0Ema_m
z6(H~KqNO?yckh=&C=`MrHPojTOp}z_rSMuX8_b9MARp;?TZSi3YO#OY8k+kP>RSuK
zuG9R8<|hS1*CKCd>^eGL7lXXKL-V?clXS2Dr~jQ3VDG)n*Tm=Z2gRy-sKySW9N)%<
z?>J{%{12Odh#xn{k;>Z#+YS}FF59xqRXEgkFyBTLWhxZ*_xaJMzffozMg14j>gk|`
zd>aEZq0p#r7h#vaMna*Pfz4!nYoW5r0O0@?WudkHWSjApx*GjB|9%>}mg8;gMp_w8
z9b=&uXgtNxYNQ>F&*!h7*Q=|urXJsy%ZJY&zJ~AZ$LG(rAIs*)(Q?n;lU$sXI^+n!
z^neK_Zc94kb|?D$dbc+J>DOR!){u?~badcsm=YEKg4pvmHDhpK`#NlkA+WWZjLMvJ
z<Q5P(x-b}MY=EV{e)LTS%(L4#mXd<<@`t#3^%|bOAn=$s6FKL^(A3g~#VAXx3*CS-
z7YX*o#evAHp`}AmcmFq>5yv7tXbFcu_4P7rkJ<ryo6&HYVT<6Ue3U&Pm^IrO=gyr&
z%*K@zs}`ZArUsI@t+;YL4#ig`uo&_^bo=OILj*zBu3b@6lnFxb|LfPU;k($C;?5C@
zW4RbV+8jYaLD&?r8P?X;(C^Q1nAO<KAoChQPEIZoc7>r&ubz-TX5b<4L~3d(8ef%Q
zru_uey(2I-8GyAE>xP(*z;p*kOr6P~zrG$8%$khY*jV&4G(sn371&Ii1edvP$V!Vx
z{uK#&YIftW^JU3peAlZtq*5u?2DoE;XaGbM|C*YbU^Q|W#ji>Zi^^y(%1qva)|z}+
zSy>??BLj&?k3vJEI|dIPf`TG~O_2n{2AN{>YCjYf7NM%(A~psJpxRjp%LQ{`Iou4b
zt*u<IsIRz*Dbr>k>&6Y}_9J*u!9YX33zR!4!q`wB%};M(k-G=t<KwYsuL#;&Jz#6i
zgOigJwrtq~U0q!m8ylnk6T!<mf(uEz(OE?W27P*?s;V01BSzv~`3+2&Xob_K)A5Xc
z1BFh?wD)Urm^#AD1QV@Bz<Jt4<XuRFmzNg~?%06n=x7eRwY9a|F}eOB#q7H<H#f&P
z-Y`fGY(raH8yXrK&_~|@ZM6kxrr2LmQGrRecCec~75B1FqxAX-xH;OvbG{R<o!pO*
zkPyU0u0i*1>M%4if&6(Pc%#Q)^q6rd&piWIS66gWR76d|1w_ZhLS0P_6;%Y;>4%Vz
zAVx%p4-$8WLrYr+#s+#YH8n*8?F)Ig3Et7Vt)qL*xI*x}_%dp4XMo;UTu(g+B_$<v
zR#rk6RTb#y=s+g>gkE}mF`WJbWM^k%uES5rKAQly1$->?aDlsr02xPjK~X^gT3T9M
z50pQ>jp1ekU@>$M{g)YtQ9MhOUOkQr7c-ERei)u^GjZ}%Dgp%axc`~Mv0=2fo`QU;
zK+~gKRMUKl>3L+++EY>O!u8LVmKJFD&_Hu@Gjw|Ea=lVdPY)kHeBk~q7~1P!y?RC0
zVE`BT-;oRCyuTwk#2sdddYfD>7K`QLDoKZqC+@JT%TrQsxTP5y{%q7~KTj<B?D5&2
zBEMv`qbPgI$@1@~-fb#sn4#rf#d(Oi_-%TprS?_<d<Bk@HF{+rd@+|87hn9q`TQ;!
zN5Aw-=4O2-)Qxz@<Kl}8G3gVlHI3L>a=67ap3e#n7(iE`@v93$yRr(|ZDelje(%RK
zB{{9ExCDjn)Gn8&*|*1a&~KlEHV1LcteY1ka=dkwzGU6MrD%K<iP76E%Hmrar?KxV
z7UNL5cWJxbIP$aKQoD90rtcy#-mJhpHk`Gpn&L!`nWi>&Ez2m(t<7)7cE`P=S$7pR
zH8o$B`3Gf&v5Z%d{g4F2edmR7RMON{Q~M{Y-nK?f?FTwHmK^BkSc!dCWD(xSscbw<
zhc(M&*OXXu>6k68vb$MWUKXT~`KTKg@QcTIpTr;qvd06qemyHffQ!4hQ{@(r$;O*V
zapKvip)22_Ie32f{lZiI?_`^Vb)QEpqV<0h&XgW~{=sma^NXE}AQsS?5mkwAosFGP
z998dae#hA|E7e_8CCUq?wm<4GMJyKV9y|y(!-Lzz>O7vhNS&717xl;ENm4}e_5RIl
z^$A2zuLoD<{#k#Y>utm<KeqHF)jfWVn!dQ|8@nj|*UKq9!I1@fRu5F}vO)4^{PqO|
z!B=m*Y1=vH=4%B74Rlujm-wuU{HL193-_9zd$LMq5ST~v|KonNFW}y1)8mmz@0aa3
zrj3JaeSKx;N%BN;_Y_e<*2CHEY<+%x|K15`S@U=)VmZ4J`M<rtf6?#1RE1IDzcncS
HFkOEKf9oKk

diff --git a/r2/r2/public/favicon.ico b/r2/r2/public/favicon.ico
new file mode 120000
index 000000000..495fe3550
--- /dev/null
+++ b/r2/r2/public/favicon.ico
@@ -0,0 +1 @@
+static/favicon.ico
\ No newline at end of file
diff --git a/r2/r2/public/robots.txt b/r2/r2/public/robots.txt
new file mode 120000
index 000000000..d2bf67cfc
--- /dev/null
+++ b/r2/r2/public/robots.txt
@@ -0,0 +1 @@
+static/robots.txt
\ No newline at end of file