From 793cdf993eb4fb6c50ccdcd496807b1345084a18 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 2 Jun 2023 10:01:26 +0200
Subject: [PATCH] adapt to local postgres db & relative url

---
 collect.sh       |   2 +-
 settings.py      |  24 +++++++++++++-----------
 settings.pyc     | Bin 5937 -> 6050 bytes
 update_schema.sh |   0
 urls.py          |  14 ++++++++------
 wsgi.py          |   2 +-
 6 files changed, 23 insertions(+), 19 deletions(-)
 mode change 100755 => 100644 collect.sh
 mode change 100755 => 100644 update_schema.sh

diff --git a/collect.sh b/collect.sh
old mode 100755
new mode 100644
index c779fa6..45dfa44
--- a/collect.sh
+++ b/collect.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-./manage.py collectstatic --ignore archives --ignore Pre-Barreau --ignore cache
+./manage.py collectstatic --ignore archives --ignore Pre-Barreau --ignore cache --ignore edit --ignore trash
 
diff --git a/settings.py b/settings.py
index 47d02f6..eb551b8 100644
--- a/settings.py
+++ b/settings.py
@@ -7,7 +7,7 @@ from django.core.urlresolvers import reverse_lazy
 
 sys.dont_write_bytecode = True
 
-DEBUG = True
+DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
@@ -19,12 +19,12 @@ MANAGERS = ADMINS
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
         'NAME': 'teleforma',                      # Or path to database file if using sqlite3.
         'USER': 'teleforma',                      # Not used with sqlite3.
         'PASSWORD': 'Lashjium5',                  # Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
+        'HOST': 'localhost',                      # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': '5432',                      # Set to empty string for default. Not used with sqlite3.
     }
 }
 
@@ -116,7 +116,7 @@ TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    '/usr/local/lib/telecaster/teleforma/teleforma/templates'
+    '/home/telecaster/apps/telecaster/instance/teleforma/templates'
 )
 
 INSTALLED_APPS = (
@@ -140,7 +140,9 @@ INSTALLED_APPS = (
     'timezones',
     'jqchat',
 #    'googletools',
-    'telecaster',
+#    'telecaster',
+    'teleforma.sources',
+     
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -156,7 +158,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 
 TELEMETA_ORGANIZATION = 'Pre-Barreau'
 TELEMETA_SUBJECTS = ('barreau', 'crfpa', 'e-learning')
-TELEMETA_DESCRIPTION = "Plateforme e-learning du CRFPA"
+TELEMETA_DESCRIPTION = "Eddy"
 TELEMETA_GMAP_KEY = 'ABQIAAAArg7eSfnfTkBRma8glnGrlxRVbMrhnNNvToCbZQtWdaMbZTA_3RRGObu5PDoiBImgalVnnLU2yN4RMA'
 TELEMETA_CACHE_DIR = MEDIA_ROOT + 'cache'
 TELEMETA_EXPORT_CACHE_DIR = TELEMETA_CACHE_DIR + "/export"
@@ -181,7 +183,7 @@ EMAIL_SUBJECT_PREFIX = '[' + TELEMETA_ORGANIZATION.decode('utf8') + '] '
 
 POSTMAN_AUTO_MODERATE_AS = True
 
-TELECASTER_MASTER_SERVER = 'teleforma.parisson.com'
+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',
@@ -192,9 +194,9 @@ TELECASTER_CONF = [{'type':'mp3','server_type':'icecast',
                    'port':'8080'}, ]
 
 TELEFORMA_E_LEARNING_TYPE = 'CRFPA'
-TELEFORMA_GLOBAL_TWEETER = False
-TELEFORMA_PERIOD_TWEETER = True
+TELEFORMA_GLOBAL_TWEETER = True
+TELEFORMA_PERIOD_TWEETER = False
 
 ROUTER_IP = '81.57.221.26'
 
-
+os.environ['MPLCONFIGDIR'] = '/home/telecaster/.matplotlib'
diff --git a/settings.pyc b/settings.pyc
index 0eb2148799e37df310d486f9ff2103be1c8c817a..b2dda0ca23113db814032eedd4bce5f42f2daf9e 100644
GIT binary patch
delta 1015
zcmZuw?NSqG6n-|L#840d7{u@?mIiD#H4tnSW*ikQRX_v%I$CkF=OqL;yX(G-7XP5*
z1vt#!fqDZ@dI9zhyn)_8XZp(<@a)nV`-7d?=bY!9XV1s`&b~8Wmka5SJzamkI^44H
z-!mxoioAO4uuvW81ZAKypcCL0*u{1Vl!eNIx(=Q52Yuii7Pub^^d)!z)D8B)J{qFy
z0iOn)gz5nGCMfb@P!4<s)DJFz2EZerLGWYHDR2PFgC{^kU=2DAE`o-^GoUlz5L5u~
zfkwc~pivy~6VMoV1vC!+5i|iM)o)>lCZQ(5x5Yb~c&p+~B}1G8KLvdS{sS}(z6<&q
zTmx?;Ll?oDpc(K_pjq(Gpz}~^@Gp32fWCo}BPoG@1)1Oj*{lo}{1*Hh)F^f@fGL&^
z@jdBSNjlDf?}O&Szk{ma2cQKsJHTt;Ejhi1U`tFLY>Q#A!a|&0KT2;Or5i`-og^I}
z??v!z6ZBou;`?N<OW<A5W$+^?V0RJhV37@M6!)VGDLp$a7t6br+we@Tn{~^6q+Hgf
z@9D4+DE-*k^7X#$`Hf2SK6P_ED{{xPEoVmrVTZ6E);Bg2r#e4ZX%D6|>C%#f%R636
zl|$ty+tQ&5%9iiz|MRA+L(8>Q`)a3e<aJKIiPhU)(6UVJ?FF{d?Y}b5jcihVnR&m>
z*%@PELX@iHC@XNAZo{;LZQnBeK$YrN5GZS}{idsGT+}1S4Pmyd(09DhY1YGT5v<<1
zeQka1#>&m>E45-u0@0mRCF<>-9<KEWtDO``;<etG_6fANy8lg0_s4V~hWPKOr3G{>
z)?VP4;m%&G?pjSJdfGcxIDWO_2~o>_w~XkYzH{S~ah0<I#kf>$Du&OorKpsnjvJPv
z+b?p%>Gs>fhEWYOB2w;?X5hI+aq$^+Rp_xd5S8*3<3sc?|16#E{37~0znSVxeFB!b
B>D~YU

delta 918
zcmY*X%Tg0j5IvJX5|CGTBtXD~pb$V3MG3yjl2Q=`6#~9mP$%h|2TUd~H?c}LEOcX)
z8*2W*r8{cYeuDS`Zr!r-1N6>7X*pGM`f++r_w75MGY9FI|5tl!%cq~K1)My+%HCA3
z4DZKghnheEhyW-E-U4r<=mUiyLZFs?V`{Gh+=VQMk)>8}H|P}D09R2`b#34%s2xJ7
zba>ba?gw>&2S8!)AgCK01NDGSP%pR!>I26?5%3Nu3LXdbgHxaZ@GfW&Y=L6n+n^!r
zu>=i+7eS}N_dsz7rG6h#N<bvQOUfJZyk+Gjy&*=yb<i1b19TR=0vZFaf^*)`<KQ(=
z3cL=Q06zvzLioW?@LmH=L7W3kgP(%Z;5~J+3|QfL@H2=ZY+V39cT1y8s^g5;@gn#I
z=n{AXGz;DYWl?DYKLEc}+j|9mt&9%ND^mb7vM&Abm=?!$@t7`ow7cFp@NgM)*&FGK
z*XSy^0=fp)u$Fpb-|)$yes!0;rJJQ%n)B(rUf32U%XIav+%@bUzPs&;N4-hG;-j^7
zXWk$5kI$(n(~wris1<Z0V^s2)x-djRmvv!zZn0)nb*B;7(ZcmsSKu!#$LzyU(us#Q
zv{89lQ7eXC7jC^sh-pLUmRT`N32r2A<rY@voewP&S|oBJ;mM|VbgLp|&2+xC&T7pm
zpCau|-;BN8Ha02UsA$Q6G7FY43uTY@(!!KMmA+$^jEXEfU)qj*Q(=|Jb-U2xf?t8`
zaG_=y>3X?Q&6|3~$hm*L{k3y6m<qY%$r-wqw0J_rxe)~^_uE|3g@g-U?z;UkOwLib
w$KTSdk_);ah4Z_&tR+(_#6OT}75=|dTMzWv2a#dz(Ec8I=l2Dg?B(eCANg#{vH$=8

diff --git a/update_schema.sh b/update_schema.sh
old mode 100755
new mode 100644
diff --git a/urls.py b/urls.py
index 8bacff0..7b1f79f 100644
--- a/urls.py
+++ b/urls.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-from django.conf.urls.defaults import *
+#from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url, include
 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
@@ -16,14 +17,15 @@ urlpatterns = patterns('',
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
     # to INSTALLED_APPS to enable admin documentation:
     # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    url(r'^admin/django/', include(admin.site.urls)),
+    url(r'^telecaster/admin/django/', include(admin.site.urls)),
 
     # TeleForma
-    (r'^', include('teleforma.urls')),
-    (r'^telecaster/', include('telecaster.urls')),
+    (r'^telecaster/', include('teleforma.urls')),
+    #(r'^telecaster/', include('telecaster.urls')),
+    (r'^telecaster/', include('teleforma.sources.urls')),
 
     # Languages
-    (r'^i18n/', include('django.conf.urls.i18n')),
-    (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
+    (r'^telecaster/i18n/', include('django.conf.urls.i18n')),
+    (r'^telecaster/jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
 
 )
diff --git a/wsgi.py b/wsgi.py
index 3ff93f9..e7e7fe4 100644
--- a/wsgi.py
+++ b/wsgi.py
@@ -1,7 +1,7 @@
 import os
 import sys
 
-sys.path.append('/usr/local/lib/telecaster/instance')
+sys.path.append('/home/telecaster/apps/telecaster/instance')
 #sys.path.append('/usr/local/lib/telecaster/instance/teleforma')
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
-- 
2.39.5