# HG changeset patch
# User tc
# Date 1317392314 -7200
# Node ID 93bb3bb1c38ee95e8f31445e7df1fbb7b6810074
# Parent  40d6b5e3dcd7063ef8f406b82707f960ea172810
fix pathes to static and .hgignore.

diff -r 40d6b5e3dcd7 -r 93bb3bb1c38e .hgignore
--- a/.hgignore	Fri Sep 30 16:06:04 2011 +0200
+++ b/.hgignore	Fri Sep 30 16:18:34 2011 +0200
@@ -3,6 +3,9 @@
 ^web/log$
 .*\.pyc$
 ^web/\.htaccess$
+^web/config\.py$
 ^web/static/media/ldt$
 ^web/static/site$
+^virtualenv/web/env$
+.pydevproject
 
diff -r 40d6b5e3dcd7 -r 93bb3bb1c38e sbin/.svn/entries
--- a/sbin/.svn/entries	Fri Sep 30 16:06:04 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-10
-
-dir
-18
-svn+ssh://ymh@clint.culturel.centrepompidou.lan/iridata/svn/regardssignes/trunk/build/sbin
-svn+ssh://ymh@clint.culturel.centrepompidou.lan/iridata/svn/regardssignes
-
-
-
-2010-02-17T04:06:29.842384Z
-11
-ymh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-c3ef06d5-b63e-434f-91e5-176c2fea5bc8
-
-
-
-
-
-
-0
-
-sync_regardssignes
-file
-
-
-
-
-2010-03-04T16:06:12.000000Z
-d3043794fee6cbe5a6d293a029c6dcd0
-2010-02-17T04:06:29.842384Z
-11
-ymh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-740
-
diff -r 40d6b5e3dcd7 -r 93bb3bb1c38e sbin/.svn/text-base/sync_regardssignes.svn-base
--- a/sbin/.svn/text-base/sync_regardssignes.svn-base	Fri Sep 30 16:06:04 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-set -e
-if [ -d ~/tmp/regardssignes_V$1 ]; then
-    rm -fr ~/tmp/regardssignes_V$1;
-fi
-
-svn export file:///iridata/svn/regardssignes/tags/V$1 ~/tmp/regardssignes_V$1
-
-#text2unix ~/tmp/regardssignes_V$1/web
-
-if [ -d ~/tmp/regardssignes_V$1/web ]; then
-    cat <<EOT | rsync -Cvrlz --delete --filter=". -" ~/tmp/regardssignes_V$1/web/ web.iri.centrepompidou.fr:/iridata/www/amateur/atelier/
-+ core
-P .htpasswd
-P .htaccess
-P regardssignes/.htaccess
-P regardssignes/config.py
-P robots.txt
-P log/***
-P index/***
-P static/media/***
-P static/content/***
-EOT
-fi
-
-if [ -d ~/tmp/regardssignes_V$1 ]; then
-    echo "Deleting temp export"
-    rm -fr ~/tmp/regardssignes_V$1;
-fi
-
-ssh web.iri.centrepompidou.fr sudo apache2ctl restart
diff -r 40d6b5e3dcd7 -r 93bb3bb1c38e web/config.py.tmpl
--- a/web/config.py.tmpl	Fri Sep 30 16:06:04 2011 +0200
+++ b/web/config.py.tmpl	Fri Sep 30 16:18:34 2011 +0200
@@ -5,7 +5,7 @@
 BASE_DIR = os.path.dirname(os.path.abspath(__file__)).rstrip("/")+"/"
 BASE_URL = '/~ymh/platform/'
 WEB_URL = 'http://localhost/'
-STATIC_URL = BASE_URL + 'static/'
+STATIC_URL = BASE_URL + 'static/site/'
 
 
 STREAM_URL = "rtmp://localhost/vod/media/"
@@ -22,8 +22,7 @@
 
 # Absolute path to the directory that static files (js, css, swf...)
 # DO NOT forget to do command line ./manage.py collectstatic to gather static media into the web/static folder
-#STATIC_ROOT = BASE_STATIC_ROOT + "site/"
-STATIC_ROOT = BASE_STATIC_ROOT
+STATIC_ROOT = BASE_STATIC_ROOT + "site/"
 
 # PATH to the ffmpeg executable, used to know automatically the media file duration 
 FFMPEG_PATH = "C:/path/to/ffmpeg.exe"