From 2e46993c6bb26d48a5fbdbce57eff2117528cc74 Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 17 Jul 2013 01:48:27 +0200 Subject: [PATCH] cleanup --- gitmanage.py | 4 ++++ settings.py | 27 ++++++++++++++++++++------- settings.pyc | Bin 5511 -> 5937 bytes 3 files changed, 24 insertions(+), 7 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..47d02f6 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' @@ -172,16 +174,27 @@ LOGIN_URL = '/login/' LOGIN_REDIRECT_URL = reverse_lazy('teleforma-desk') SESSION_EXPIRE_AT_BROWSER_CLOSE = False -EMAIL_HOST = 'smtp.numericable.fr' +EMAIL_HOST = 'smtp.free.fr' DEFAULT_FROM_EMAIL = 'webmaster@parisson.com' SERVER_EMAIL = 'webmaster@parisson.com' 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'}, ] +TELECASTER_MASTER_SERVER = 'teleforma.parisson.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 + +ROUTER_IP = '81.57.221.26' -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..0eb2148799e37df310d486f9ff2103be1c8c817a 100644 GIT binary patch delta 1095 zcmb7C%Tg0T6g?A0qftsIA|M6@9}pi*9+D8Fi$okS7)YE1(Do5yZU=&SIWyp6!@`9d zH`Hw1_yby0KES;TzrsIo>%#5{QsB<%n$x%MIeqW#+x_9%t`_L|)$2R{@#ljI_CCLu zQ{uP!Jv)Jvx&eB*^ZdSA2Q_xSMz@<_eozbSH0V6oAgB#C1eydJ1_i;+fL?)(fK0Hn zpu1oJkOejhx(9X+lmR;r-UnL15E}y@1Kk(axNBvFbpc!jy9lzuE`c_|E`#!56QBp% zAOmY2ut`t>EC?!sT>&kFT?Ov}t>C=^b`AVG*c50LOaqB=sBtA-L5U@D!B58PW1}+ioXAp~%gs7Ktach!&3}6XEG_r`AfUmHm~z)%WRaLU9W$z&CObiEbGD^Qz=_EHzlR6w=BE!=@?VCPs$5z*ln$9 zaxTDDgyXTT3f#1-3Ckmlr(@QjnD(PMjL9@Pz>+Nd>ZhXl#8Sy``b zaVunv3TbGoY=-KswU7)~Ipx+AGOf4GiYC0yMc;%n?JW2LLtTN(mm2LGCF0fcX5Dr+ zd{atHDpCg(ulb9{Uy1gnQFl*}2q(h!5s`G(n9HXvdDcWki_K`!Xhe&~JAEg}0SIQD4JYM~ZQG{~D`s;`bGCdSa@SnWSWK7nQdUnJ zOPQtlQt?qf7#0q31Rr~Gif e``>vzM^z|LoXqLO@KHsMe#I+>#9oi<@%#Z_b_Z7g delta 728 zcmYLH%Tg0T6g`~`K@%yoLV}M#cnCx>GfBW0T*YGH0~HMT;3C41+l1gu24@CQ%PJNw zT;u$JTUVB5=gv=Y;}77@jXjA~bXA{w?mg%B?ds}p`p4-^^tdnnd+yXy9sgHK#j4ug zu{g?9wQX?YXmdf^0XL7nmJWA81K^jS6gUe?gDub?cnWkLoC93|+n|f!7U&Xq9+Uw) zpds*W&@lK8C<}QOd>4Z>0yzS{r`TwREhshyse#79d!WnUSD*>-B4`r4bO?TgMg%kk zu7PskWzZGy3g{|i6#N(;1ZW!a8YmBb0@A_iIHQ9F@KeYPc8lO=p>vQ|)x=U~;tZM^ z_&%6W<~8th71qHoRM-G-qO9aue$ds;uD;dP>m5D3*DRPp*TE801`90b+;%atEaJWD zQ4L#i(`B?n-J~3)2kw%44>cj_w?4jE!}3_+_I#;?fOF1 z*L+RkzQ0}ZB8se!1b^a_Vl;T4$Y>k(-c0Z?kr!iOYHl3JEn9zMTb-6lp;GWhRf{hz zSvNgjy4B)bNiUWwdO@El-Zb6%PV=?&3@@u(#*Sl46!8c}tpZtJ&%v zR|{`f8&l9VkB8|=?M6F)E~y2dQUk$yYBoruSHzECGySedK*Y4*SGp3*iit=}`~!Ys Bp_Kpt -- 2.39.5