From b36f0abd2dd2fdd5a17eb09e3c5fa5a027995197 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Thu, 7 Nov 2013 23:12:30 +0100
Subject: [PATCH] add context procs, add branch

---
 gitmanage.py |   4 ++++
 settings.py  |  25 +++++++++++++++++++------
 settings.pyc | Bin 5511 -> 5954 bytes
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/gitmanage.py b/gitmanage.py
index f782d74..6cfd2c4 100644
--- a/gitmanage.py
+++ b/gitmanage.py
@@ -42,6 +42,10 @@ class GitManage(object):
         args = 'diff-tree -s HEAD'
         self.process(args)
 
+    def branch(self):
+        args = 'branch'
+        self.process(args)
+
     def add_repo(self, name, repo):
         for app in self.apps:
             if not app in self.exclude and os.path.isdir(self.dir + os.sep + app):
diff --git a/settings.py b/settings.py
index 3374a5a..62623e4 100644
--- a/settings.py
+++ b/settings.py
@@ -61,7 +61,7 @@ MEDIA_ROOT = '/home/telecaster/archives/'
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = '/media/'
+MEDIA_URL = 'http://192.168.1.65:8040/'
 
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files
@@ -139,7 +139,7 @@ INSTALLED_APPS = (
     'notes',
     'timezones',
     'jqchat',
-    'googletools',
+#    'googletools',
     'telecaster',
 )
 
@@ -150,6 +150,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.i18n",
     "django.core.context_processors.media",
     'django.core.context_processors.static',
+    'teleforma.context_processors.periods',
+    'telecaster.context_processors.host',
 )
 
 TELEMETA_ORGANIZATION = 'Pre-Barreau'
@@ -179,9 +181,20 @@ EMAIL_SUBJECT_PREFIX = '[' + TELEMETA_ORGANIZATION.decode('utf8') + '] '
 
 POSTMAN_AUTO_MODERATE_AS = True
 
-TELECASTER_CONF = [{'type':'mp3','server_type':'icecast','conf':'/etc/telecaster/deefuzzer_mp3.xml', 'port':'8000'},
-                   {'type':'webm','server_type':'stream-m','conf':'/etc/telecaster/deefuzzer_webm.xml', 'port':'8080'}, ]
+ROUTER_IP = '80.15.175.56'
+
+TELECASTER_MASTER_SERVER = 'e-learning.crfpa.pre-barreau.com'
+TELECASTER_RSYNC_SERVER = 'telecaster@jimi.parisson.com:archives/'
+TELECASTER_RSYNC_LOG = '/var/log/telecaster/rsync.log'
+TELECASTER_CONF = [{'type':'mp3','server_type':'icecast',
+                    'conf':'/etc/telecaster/deefuzzer/telecaster_mp3_default.xml',
+                    'port':'8000'},
+                   {'type':'webm','server_type':'stream-m',
+                   'conf':'/etc/telecaster/deefuzzer/telecaster_webm_default.xml',
+                   'port':'8080'}, ]
+
+TELEFORMA_E_LEARNING_TYPE = 'CRFPA'
+TELEFORMA_GLOBAL_TWEETER = False
+TELEFORMA_PERIOD_TWEETER = True
 
-TELECASTER_RSYNC_SERVER = 'telecaster@192.168.0.31:archives/'
-TELECASTER_RSYNC_LOG = '/home/telecaster/logs/rsync.log'
 
diff --git a/settings.pyc b/settings.pyc
index c958dffa5b5c5d2deecf3670b437fc74626ebb8f..eac51e535d29500fdde42df9cbc240e1905484b4 100644
GIT binary patch
delta 1081
zcmb7C%Tg0T6g?9LqESjLq5%zxFNhCj5+pI83nC5}4J1q=X!{65ZUe!*oEh-3Vc`O|
z)NEbo4`^BW0IOWO@K0R1bzyg+0`8oyIeq7x)A!!F)!Uc9XyJ|@-GO(Z@AD=6eu843
z6t8pCw-cUJ*FjHrmhP$*P<7|y=vECZ2&#h}1Dyst4r+jfK*L~tpa@t$=o#1vkPUVc
zbPFsDa=->ax4}+<(qN~-dq8&(VuRp=pt~YE(~2@8It#9XoddaG=Rq4_7eG0%A<+C5
z$i%7-Y#5XWi+~DX7eV*HE`fJ|7VugDy9|B>Yy`9jrh!B{y@gTGeef{WW1t7p86qYs
zj<zaZ1w8~C13dzZgC2t=Ku^G~p{#;tK}94?S^`-}&@!kbHUe=Zq(0ZuX{9Z%w&k^!
zEc;D@%3$NIz9w4bu7echBb&`$UtS6Ki;=InZev2%W8<S*ERob=S|UD?jE+T{jgDTm
z>G=an_jzG+d4;dk?W*N{@&}JMxLvN3<DC7ilq|>Pwv^Phy5lzA9@tj4oWnv*MzvU6
zi(QLr@q{xd2tHEbmR&2?R<)A7(y+9K%}16k+ve7WR;pK>p?x_g*UQzi*0Aid<J4=?
zFk#uHwelu+bZ0<V^-asxEA>@fcG&Jix1E=@lBx;TI~N#I#=JX$aA=RASZ!P_5?`@4
zDz3L47*XQVq3?A(=gZYU7VSl~;;N!nGMbFKog$brr*o-h&!G=KCD{Dj-K%s)4hY(N
z@BjH<)0&afigbvhW>|v!AtxYUcS;eT6b2=n5zscvx$og_G*9&Os+SH*HhZsNn8kF?
z?Gs-GBV$aZ@{*ZtZ+XL9FidYU7~gV_>~~CM=cZkGCFH5;tT~%18pVu}GUw8BGsVJ#
zobfkjTb;>dZ>BQE!lGe_3jc^X!%Syy{ShM~Eq1}t#IW83Q_45*Yw(rd*QG*%;-!xz
S`?`Exid;t(zgQBxTg)$bMFWxm

delta 682
zcmYLHO>a^`6g>m4RKcbi3i$C_ptUVpd3=i0g~4>8wVGC_U)L(7+!3e`9_10M#-s}q
zT{mxU+`2N#&Yk`ke}G-OaUPg-k~#O>IcM&@nanTa<C5+@n(+T#KCw~9{}ocPq_%w|
z4)v1u0^B&<UelW3*5TLe!7gYD{1OxbM?qn*35tLhL1)1U&^d4$bROIRT>!6ubg%`Q
z2HyhBfNz7Mkf*_`h)@hN2EL<Me8|=mn}yUsbKoxMB6trp4_*f?fHw}n_tEfx7Qtmu
z0$c%I0&jvYLwdmv@LqtHAg_Ru;D;astjeW^m<B(B)UlfZKX#oFexf>NhaGchY2dqH
zLV=%xw^Vorey&0lyp4jA^L%fl*GBrzNUsldcdk5`L07>NQ~(Q961_pjQxX1g^{A<~
z<W_C)*&Ea*11fJ=R>PEi%QEf3_wj%jOq~26oN!=4#GOw8U8}acIj0*)idi?URrlpi
z+j!kJ`<l93Oc&F3T#>#sWxZziWv`T3&Kj9Q(MTJ)%=KEY-fX>+cFK;ry_;5BrjETS
z(`wkMp8cj%Hxx~Hl*ifdWCyWR`yQYB4eX$Eb1dw1d|#Zc$#s8OS7!;IYx_C=cO~If
ztUT?)i~`%QKqgID>vdY4QMs}^U3pf)$UNt!$7k0DH_ik#=UZsXc^Aq%dU#X(aQ4D)
S#{`5=bN+;jzNnb@_{2YGz?Ogj

-- 
2.39.5