From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Sun, 17 Sep 2017 21:54:41 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e2ec9c67affa0514c1ac075ddc422c64924462df;p=telemeta.git

Merge branch 'master' into crem
---

e2ec9c67affa0514c1ac075ddc422c64924462df
diff --cc app/settings.py
index 848fdc6e,62e73c64..7aafbb8c
--- a/app/settings.py
+++ b/app/settings.py
@@@ -211,10 -209,11 +210,11 @@@ TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp
  TELEMETA_PUBLIC_ACCESS_PERIOD = 51
  
  TELEMETA_STRICT_CODE = False
 -COLLECTION_PUBLISHED_CODE_REGEX = '[A-Za-z0-9._-]*'
 -COLLECTION_UNPUBLISHED_CODE_REGEX = '[A-Za-z0-9._-]*'
 -ITEM_PUBLISHED_CODE_REGEX = COLLECTION_PUBLISHED_CODE_REGEX + ''
 -ITEM_UNPUBLISHED_CODE_REGEX = COLLECTION_UNPUBLISHED_CODE_REGEX + ''
 +COLLECTION_PUBLISHED_CODE_REGEX = 'CNRSMH_E_[0-9]{4}(?:_[0-9]{3}){2}'
 +COLLECTION_UNPUBLISHED_CODE_REGEX = 'CNRSMH_I_[0-9]{4}_[0-9]{3}'
 +ITEM_PUBLISHED_CODE_REGEX = COLLECTION_PUBLISHED_CODE_REGEX + '(?:_[0-9]{2,3}){1,2}'
 +ITEM_UNPUBLISHED_CODE_REGEX = COLLECTION_UNPUBLISHED_CODE_REGEX + '_[0-9]{2,3}(?:_[0-9]{2,3}){0,2}'
+ RESOURCE_CODE_REGEX = '[A-Za-z0-9._-]*'
  
  AUTH_PROFILE_MODULE = 'telemeta.userprofile'
  SESSION_EXPIRE_AT_BROWSER_CLOSE = False
diff --cc docker-compose.yml
index 7b82c43a,9fb0d7fd..89c75823
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -25,10 -25,12 +25,12 @@@
  data:
    image: debian:jessie
    volumes:
 -     - ./data/media/:/srv/media
 -     - ./data/backup/:/srv/backup
 -     - ./data/static:/srv/static
 +     - /home/parisson/CREM/Telemeta/media/:/srv/media
-      - ./static/:/srv/static
 +     - /home/parisson/CREM/Telemeta/backup/:/srv/backup
-      - /srv/bower
++     - ./data/static/:/srv/static
+      - ./data/bower:/srv/bower
+      - ./data/log/nginx:/var/log/nginx
+      - ./data/log/uwsgi:/var/log/uwsgi
    command: "true"
  
  db: