for teleforma 0.7-dev

diff --git a/collect.sh b/collect.sh
new file mode 100755 (executable)
index 0000000..c779fa6
--- /dev/null
+++ b/collect.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+./manage.py collectstatic --ignore archives --ignore Pre-Barreau --ignore cache
+

diff --git a/gitmanage.py b/gitmanage.py
index 40d6128afca4f7840599bdcb6ad28375bfa208f9..f782d74abe92413a9710fd82bf69180173657fc3 100644 (file)
--- a/gitmanage.py
+++ b/gitmanage.py
@@ -15,7 +15,8 @@ class GitManage(object):
                 print app
                 os.chdir(self.dir + os.sep + app)
                 os.system('git ' + args)
-        os.chdir(self.dir)
+                print ''
+                os.chdir(self.dir)
 
     def pull(self, repo, branch):
         args = 'pull ' + repo + ' ' + branch
@@ -33,6 +34,14 @@ class GitManage(object):
         args = 'remote -v'
         self.process(args)
 
+    def show(self):
+        args = 'show'
+        self.process(args)
+
+    def head(self):
+        args = 'diff-tree -s HEAD'
+        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 cacde6ce52939c9f3646c043000de1d1a902366b..3374a5a2a90defe0dc4570658f0f98dcd955f639 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -182,6 +182,6 @@ 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_RSYNC_SERVER = 'telecaster@jimi.parisson.com:archives/'+TELEMETA_ORGANIZATION+'/'
+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 933a942bc219c498a83e54279a71d49b9385b96f..c958dffa5b5c5d2deecf3670b437fc74626ebb8f 100644 (file)
Binary files a/settings.pyc and b/settings.pyc differ