From 4a227601df1a2bf9b9de370ac5e7a4041065938c Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Mon, 13 Jun 2016 13:42:03 +0000
Subject: [PATCH] Added default media and photo directories for use in
 development.  Changed settings to point to the media dir in development.  -
 Legacy-Id: 11341

---
 ietf/settings.py                   |  36 ++++++++++++++++++-----------
 media/photo/nopictureavailable.jpg | Bin 0 -> 1618 bytes
 media/photo/profile-default.jpg    | Bin 0 -> 1397 bytes
 3 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 media/photo/nopictureavailable.jpg
 create mode 100644 media/photo/profile-default.jpg

diff --git a/ietf/settings.py b/ietf/settings.py
index 27f86a774..6327dd420 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -100,10 +100,16 @@ USE_I18N = False
 
 USE_TZ = False
 
-MEDIA_ROOT = '/a/www/www6s/lib/dt/media/'
-MEDIA_URL  = 'https://www.ietf.org/lib/dt/media/'
-PHOTOS_DIRNAME = 'photo'
-PHOTOS_DIR = MEDIA_ROOT + PHOTOS_DIRNAME
+if SERVER_MODE == 'production':
+    MEDIA_ROOT = '/a/www/www6s/lib/dt/media/'
+    MEDIA_URL  = 'https://www.ietf.org/lib/dt/media/'
+    PHOTOS_DIRNAME = 'photo'
+    PHOTOS_DIR = os.path.join(MEDIA_ROOT, PHOTOS_DIRNAME)
+else:
+    MEDIA_ROOT = os.path.join(os.path.dirname(BASE_DIR), 'media')
+    MEDIA_URL = '/media/'
+    PHOTOS_DIRNAME = 'photo'
+    PHOTOS_DIR = os.path.join(MEDIA_ROOT, PHOTOS_DIRNAME)
 
 OLD_PHOTO_DIRS = [
     '/a/www/www6/wg/images',
@@ -597,11 +603,6 @@ BADNESS_MUCHTOOBIG = 500
 SELENIUM_TESTS = False
 SELENIUM_TESTS_ONLY = False
 
-# Set debug apps in DEV_APPS settings_local
-DEV_APPS = ()
-DEV_MIDDLEWARE_CLASSES = ()
-DRAFT_VIRTUAL_DOMAIN = "virtual.ietf.org"
-
 # Domain which hosts draft and wg alias lists
 DRAFT_ALIAS_DOMAIN = IETF_DOMAIN
 GROUP_ALIAS_DOMAIN = IETF_DOMAIN
@@ -609,11 +610,16 @@ GROUP_ALIAS_DOMAIN = IETF_DOMAIN
 TEST_DATA_DIR = os.path.abspath(BASE_DIR + "/../test/data")
 
 # Path to the email alias lists.  Used by ietf.utils.aliases
-DRAFT_ALIASES_PATH = os.path.join(TEST_DATA_DIR, "draft-aliases")
-DRAFT_VIRTUAL_PATH = os.path.join(TEST_DATA_DIR, "draft-virtual")
+DRAFT_ALIASES_PATH = os.path.join(TEST_DATA_DIR + "draft-aliases")
+DRAFT_VIRTUAL_PATH = os.path.join(TEST_DATA_DIR + "draft-virtual")
 
-GROUP_ALIASES_PATH = os.path.join(TEST_DATA_DIR, "group-aliases")
-GROUP_VIRTUAL_PATH = os.path.join(TEST_DATA_DIR, "group-virtual")
+# Set debug apps in DEV_APPS settings_local
+DEV_APPS = ()
+DEV_MIDDLEWARE_CLASSES = ()
+DRAFT_VIRTUAL_DOMAIN = "virtual.ietf.org"
+
+GROUP_ALIASES_PATH = os.path.join(TEST_DATA_DIR + "group-aliases")
+GROUP_VIRTUAL_PATH = os.path.join(TEST_DATA_DIR + "group-virtual")
 GROUP_VIRTUAL_DOMAIN = "virtual.ietf.org"
 
 POSTCONFIRM_PATH   = "/a/postconfirm/wrapper"
@@ -650,6 +656,10 @@ MARKUP_SETTINGS = {
     }
 }
 
+MAILMAN_LIB_DIR = '/usr/lib/mailman'
+
+
+
 # Put the production SECRET_KEY in settings_local.py, and also any other
 # sensitive or site-specific changes.  DO NOT commit settings_local.py to svn.
 from settings_local import *            # pyflakes:ignore
diff --git a/media/photo/nopictureavailable.jpg b/media/photo/nopictureavailable.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0895f9f57c74c6199a8eed323d71fe1caae52c9e
GIT binary patch
literal 1618
zcmeH|+dmTu0LM3)<nCZ1%TOm}$keE53nO!%nY-LpE*YYu#N0NSa*b9<<D8DdBrJ+7
zcS`u2Qpq(dZA>k;R%}$~pEytF;rIK#{T{wAzdTR(6Uqv@3IG5=8S8}c`bFZuk(c|`
z37l)*0KhioXnT84ti3(dGco>jbnGbrz`CG-5FDjP&_s16MH=lH!^a-VId>PWyjQu@
z=THr+BV%?J5l6=&rVM#R@#nD{Psgk+J2z`Q96Zx3mMb;;pR{K}jlZf+qgdwG6!uO{
zK#ftX?-Wnom0Er|(y~0dqj~Ps=QLrJ;8yDAN09;$?@_%Uy+jiTuDEBa4d*1~7SWEG
z6jO7nwdHDjaS)T>I#(HlhvNAMf%EpgsUdG)&2BLo+Z`cV(6jpCtsn0y(u#mz?hr<j
zffqMQ^wG-!yT#$Wc8lZv<`*9>M7-%sLZuf(pZ);jyrh8$_!!!CwW8+(-yM}C7WZF=
zRJ+CS>v@ZRhFAVETiu)>2-{+idZKcKq`o`j<qQ;65EdjcIlPy<fa`auzshiw%5%<;
z$ZdM>rs<U>>S(#*nYoIlT6F;?h&jEzp3S)3_~5cZI+uzN!Z@b1aVzdKe9vS<ed)l>
zp5*@a!vSk+$Zg$u9f1|ALx~a+{?;0Iartn?NNNg3y74&0NlZ>;9Qm}A#uHNMrrV`|
zUoWF*^;2jWHIBAoE@!KG##v2PCq{P>n_+hKFO@*^_rauE-nfgBw$+5b3z)x=<yHLy
z(|RQ_v&mns0heFkF=hH_nZJ%37}HK;q~#zQvNG7ptvf)*HxA}@DY*H`suPWm%guu)
zqv|Lsa&XN?O`XdjHK(<Aal38Sj<U)}d)U2YTf@U4l=X*WtOLYcR5rLpS6avfzdW_t
zkP{T4flh~6$)JDNf&TWEGJX<{6_=ca0}WFy+qj8K^;$HDf{jV%Scj7~R<Ac7=UaN!
zRyxccVRcrA{;)jY8iaqtgsHS$G8)-00R?wS2Sb{JmS9%6HjYkJhws>W$U0vN7n?|9
zZokX;;JezMI27=_v&FS<CDt$LJVBQv_a6M^pYnmc0f_MI>IYv{$8`GBa&D6-*v3EJ
zOvRCT9kda%?xW*gfMJR#qFffNYaiKobFgca{ER$G9wYYz%akBTs@}5~%o6mILI%Y#
zLfwG*RB+19_Q)mr8K$#=QLNT(aAGfF0T%{e+ovQSVTYT{qBrs-V21gvV-S@H{f~Df
zL2NT0V4kE|M&!0dAb2k&l<kN3#JgFuZ8h@u*c0>15Z>P&`U-0duX!wbMXTYFc#XQ|
z30u|N*4pH1l8i(Oc~uwJ;<fxDVva21|MF-YUwKsPyvvKyaNQ=v0eZzUk9K$GrD4~?
zD17b|DPR{!FefS!Rl++}H3H2}+>|JFv(c+75;IOA3qaS)%o;L^+d2Mh`y9wxNS$h#
z?tzpzr76Cf__iW`vH`!4zB#cp)1SoTnr1$*LRLMQ7o2;II{u>p5Lu7`tY)MUJVUqQ
z0RR~Q7Gvvu0r;uZLZR=V=D^fd{(2^A2py^jjCW{&8()!)FE06#D%d1{JvP|QwXj+;
zY|r9f@H<mA@7~k>d}iV#4az7686bOo)NGF$DB2}c8==|f?7-9&`9RxkOH`QrTlKbV
z`4>C<)mn^VLF%_PTA;)elM04T`-rx~h4-~E#qPt|#gH%)8no*Fq5r@UKi@Jb9qAz3
erH0!=i&Q7I<(v2jXU|_>0l+%AWA537X8#0-_TYm6

literal 0
HcmV?d00001

diff --git a/media/photo/profile-default.jpg b/media/photo/profile-default.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d6b03e100415a0fa9effad25c793f33957929e2d
GIT binary patch
literal 1397
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!I^=X2?RhSGZ3(_v48*v8yhPdCkGc7CkH1d
z7Y{!V7dIa_Cnv8UFCV{vfS>>ukC3pCfH06P05XITq?4J21E^7eo0A(TN+S4wfI*Oh
zA%!7@nNf*>Nsy6Qkn#T!25GQUnSsuQ0}gg37NE<3k~RVijLbkcb24+YLKHAEFfjuq
z*##916FG#0B^(2Tr#w_DY!neSG7m~hE-G2LQQ6pe;^vD$-6F__LQDsV3L;qr6}`p4
z!wfW8kXewyp5ekpK}JCV!P>Ier_+?rbWdKHE7*~#p#0QyQ}e|`{OR`!-(>uFVYbSi
z_fx^?Y8{@R=lZJ8ddOYb8nkom^=1i&%Z=CXH95KFgg%)Tdd($qGTX%sg3C5qe%w(L
z^&rfD#+(`RU43<LGlcpEDYL%c9wLyU{NeuQ;O~C-RNgq+FM6s{<gC1CYG3jV@0jbn
z+#dHh-e`9*DJdu^0SUdglP*Tq?+J|5eap9U{oE-ZnRm~5#J0TQdho%LX%kOAn`X7<
z#umva8HH4r1#%y`5Bz6vdHumL{2`BK*1?LZ$$Ynzc-v;qviz0tGR5A@y-+>>?GDyA
zi-2ZxuAlNP?sD`i&5v(aF-m8r{<J-~R*G-BQ>5D5cMQ!(_%4O9t>yW>v~RuU`$cX|
zNhwBKzKfkX{3pv!OW(o8g~bI(ur4nu_;qdjzj@35xu$7*Joy+ZYL<P=WgYL!n}Ncf
zzum+I|70|s04a9-u=C;9;Ew%%=YMT<)w*zg){2!yi~gh*$Z9KfF5Y`?X7hgr|AVeC
zI64|SI)KFPYuZP{<o5>L*YKNsA;djUZg*#P<Ao1a8R4!1@i&V8GvppMv$FoXEKyZA
z$H`5gY|FPT-vvrp%A5A8ntk$}x8lzGFUK-{tur50^v|hme0n@@_SOq^rzSbL#A;t&
zk~?efh3TBECQFy@KKM-5<WV!jQ{UbPbFWwkH5Gh!`WPL1*537&pftZM_Z)Yzm2Zn@
zMJ}KEImGLy>cpextM7Qv@%!X?FPsG&04%Owb|~v@3`+>FnaqFt^rGa3S*v`bS?p)t
z{lm7riGOx>%y+h}OD2^t@Ge=qSl7}bZX>^I`LVWW-yJWWU1nVBbGXC)w%mV)?1p>W
zc($GRqun4aTeC*o`+(G}lQT>@{t26#-`{$tTCA`6?BO4I$6IqZ-YWRJO-d``yOG)3
z!ry+@cPb`%eVHgAD99E+Gm^W_@Vs~NHnu2zy{pG6X8zT@`=dv8`CHz-zupCXGdwV3
zK2uCx-jTBF2V(qPjcZq=F>md^Q+xY(2G_?}>8pJgJJx=>l|Su;cBY!#ouKW3?`0SC
z9WrZ?pTA<e&FLrCi?@_)?_o>X5!f5^i+ygEl6=8`h6x3~;%6paa#b<1l3ZL;WO#I4
zc3bO`e3mj1nLt6t=$+;wfvIh>f^OH?15J<5GP!zWuK%7Dof+SF{+*FAPg}g<w(9n-
zD2bLp_RGa{&&ocJU7<52$UJh+`HySo1z)u~^Q^u%=hM6u+7t>-RVtd+rSaJ=Std8L
zR)nwIB=cNZd**v<rl;4^jsIk)Px%_p*;Cm2TsF@4*Pj=@ft?$LMQV<Hj$Sw0PQ%6o
Ol*}Pf4QI*!zX<?xt}tl;

literal 0
HcmV?d00001