cleanup

diff --git a/gitmanage.py b/gitmanage.py
index f782d74abe92413a9710fd82bf69180173657fc3..6cfd2c48d6d99d2d68bc44ca90011a8013e547fd 100644 (file)
--- 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 3374a5a2a90defe0dc4570658f0f98dcd955f639..47d02f61ecac2d46c471100a075044998c5c269b 100644 (file)
--- 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 (file)
Binary files a/settings.pyc and b/settings.pyc differ