From 647a700f2a85a9ff7d8277a68f1795aec40b0a88 Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 20 Jul 2017 00:51:11 +0200 Subject: [PATCH] update settings against teleforma 1.1 --- .gitignore | 1 + gitmanage.py | 4 ++++ settings.py | 55 +++++++++++++++++++++++++++++++++++++++++++++------ settings.pyc | Bin 5511 -> 0 bytes 4 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 .gitignore delete mode 100644 settings.pyc diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..539da74 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.py[co] 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..19d0259 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 @@ -131,6 +131,7 @@ INSTALLED_APPS = ( 'jsonrpc', 'south', 'teleforma', + 'teleforma.exam', 'sorl.thumbnail', 'django_extensions', 'pagination', @@ -139,7 +140,6 @@ INSTALLED_APPS = ( 'notes', 'timezones', 'jqchat', - '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' @@ -168,6 +170,7 @@ TELEMETA_DEFAULT_GRAPHER_SIZES = ['360x130', '640x130'] TELEMETA_DEFAULT_GRAPHER_ID = 'waveform_contour_wh' AUTH_PROFILE_MODULE = 'telemeta.userprofile' +AUTH_USER_MODEL = 'auth.User' LOGIN_URL = '/login/' LOGIN_REDIRECT_URL = reverse_lazy('teleforma-desk') SESSION_EXPIRE_AT_BROWSER_CLOSE = False @@ -179,9 +182,49 @@ 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'}, ] +ROUTER_IP = '109.190.89.141' + +TELECASTER_MASTER_SERVER = 'e-learning.crfpa.pre-barreau.com' +TELECASTER_RSYNC_SERVER = 'telecaster@eddy.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 +TELEFORMA_EXAM_TOPIC_DEFAULT_DOC_TYPE_ID = 4 +TELEFORMA_EXAM_SCRIPT_UPLOAD = True +TELEFORMA_REGISTER_DEFAULT_DOC_ID = 5506 +TELEFORMA_PERIOD_DEFAULT_ID = 6 +TELEFORMA_EXAM_MAX_SESSIONS = 10 +TELEFORMA_EXAM_SCRIPT_MAX_SIZE = 26214400 + +PASSWORD_HASHERS = ( + 'django.contrib.auth.hashers.PBKDF2PasswordHasher', +) + +BOX_API_TOKEN = 'D2pBaN8YqjGIfS0tKrgnMP93' + +FILE_UPLOAD_TEMP_DIR = '/mnt/data/tmp' + +SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies" + +SOUTH_MIGRATION_MODULES = { + 'captcha': 'captcha.south_migrations', +} + +SUIT_CONFIG = { + 'ADMIN_NAME': 'TeleForma Admin', +} + + +# Name of cache backend to cache user agents. If it not specified default +# cache alias will be used. Set to `None` to disable caching. +#USER_AGENTS_CACHE = 'default' -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 deleted file mode 100644 index c958dffa5b5c5d2deecf3670b437fc74626ebb8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5511 zcmeGgX?NSkaVXieWy?pLL%tF#ag@k*P3p2N_qBb7NRVd2%K#+VNMjVlE=fo@XzWtg z*Z!;ip#FjUfOcjI0Z1bz|h8Sr!9 z=YiqSMObGuz%HfDWo%}FUBTumuxn{^9h*;J-M$3u2H2N@^?~`&!|9N84(uyxv8(ER z4cJYvuLHXU_9wt@gM91?&ab_kiQ%HJG#KfzJc`0imxI^dmywC>ibp8-V>Su(x0@ z0BeE$9k4dAmrCaEff-;g0yDvW0L%jWA@FHnTkv<(=p*2N0Q)hpZLkZ#P>DtLUIMlQ z{4VS+1A9f3bL=%PxS|$Z1^*ndIxrhG^%JnaV)HYwH`qA9{s!wb+(?Jrbhwiaduo_e zxdx1Z{R9{Xd!1};E+%Mv|6llPE}{p3oW)nd_jw|?6S&7m;szqBLq7=IVaVs(JP3H= zN8$@aAMj4-3dxh_12^%7h@*lRhw?lQ)qNp_;tdFThd|s!0=DZ$y|}a#-|MiWk2Dbj1!-W-^N=`Rb?Wt z+v6kN6kPn_&FFG9u{~O8DCL z`N0JB89H=_vOl?mhJEw_-$T>I(FE@qB8DgqD(W2(8!2vr@oW);*mDD3sHOecC&f%f6pIBQOqg?^-R0c|nl7;zMiyO^Ak zfv0klh-oiZ5i8;(D9HXW>_n~~$WJm69e#+rQi97%h#eb1%{GXI4Bbd2%g{~sh65+` z4{=>eeNl|NN^_SV^5Zzd9woKiw_e|s@-l+GIPL{p#&ICj^y4fdzQf^c$0|TjzlYKp zB(aCeiZK%;{Ou6u6ptoJ)5M{iSDEBp7G=G8q#sF+ad&E3KkCGX;{N2MXRq%sZ$#qT zkJG6PC>B0Wn5H{HnrSEe@ur(393>{Zbw)5L)=RnrSCBdQkw_+_&OV$9^ey znA_;smgcM)Mzz%$K53U@f3p_$++aJ3>RT&E%{8N;DSLaa*XL=@=ZAwhk%ELRG8bKM z8liBos-lukONBUa_kBwGYJ;omONYy=OA20JOJNE>BvM;)$WrkzaSr;*-A}x_FcdsN zr%;E4I&gv*lSEPZbr#)^85eshoJA-Hg$R%E1T$F&6Ahkpbe8>;W(?Wg5On_iJg@o` z&PpWTQ^%X~T3it80!M}V*GOCB(wodFjPvgB_!voW%Z0-*P*b7&T?K3`EiEZP>4=U% zA<@p^<4}C_tFw{fvgtOKHkJgfK8~5^%g$^Aoi1_GdDDVIQ1GV(#Tbprg^V_;Di#rhMRFGLJF5m3X&3)L z+fVA54`|}QbG9$iW$kx=HXC%x8Wc7L|^MU|GqKOR^-xgUUHbu%>f5N0NInzi9uNfx&BM!T+A zx|5>FXj-{ZYnrNFYiLcasvD*%oywY}ZEB{T_N-b%ckI^aN?6yL)h#47)d^+RaKc(y zO@X&Ur?$M&%sTburKYN|8hW{=IYz5xsp-@1mQhy+n`voQt(1;Zc`@qKFkRo$ZlzY& zO{ZK#0cp3B$V#nQCczc2UNUsc`B8r@$;TVDa=EVWXol{T>UcRtq3Pa9f;c#Tsnx8= zD~K4Yh87@Yp;|1hUf0Wx)^3}Ud_5yVHcNkHIc=j=(oM64EEFl0Ue_BsRxK@~sx@mi z?yA*PRc$t6Zf*Xcmn>6KcxBkKZkCK%`!spAp|!KUWaK5S^a71oGbF`ghSp!v9ord? zQp{$fWYLMScR0(foo2nIl^wmQZQ_XuVAwDt?#aLk&GR!a3f(&zgm=x*c#+LrZ#Y(TEz zG+O1Ydiu?x-onopWM1V0Y0p3hG*I&jO$B1b4Fs1|qo7lmXebBuha`?>Ih#gn2S0G2 z%d|{gxs~3~YIR3_%pkWq5vXFc8jc!MZiPJC$d)1~yjU8BWbAZ?k^NC>y;6InLcEP% zNHF#s+)ayip&JyUnkla#7ip=anHC8{zItNP5za7QH%m^sZ01t$jN$In>INqR1&IPe zAHJF5w2oQE4@sk**<4=1 RCv84AH#WzX4Wj9DM)) -- 2.39.5