]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin/master' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 25 Apr 2016 14:35:26 +0000 (16:35 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 25 Apr 2016 14:35:26 +0000 (16:35 +0200)
Conflicts:
app/settings.py
telemeta/pages

1  2 
app/settings.py
docker-compose.yml
env/debug.env

diff --cc app/settings.py
index 0000000000000000000000000000000000000000,3e3074e110c02007bd09ca60b4c566a8c916ed15..f6eb9ff7c3c7177d0164c4eb2365f4e07bb5057a
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,334 +1,335 @@@
 -TELEMETA_ORGANIZATION = 'Telemeta'
 -TELEMETA_SUBJECTS = ('Telemeta', 'web', 'platform', 'audio', 'semantics')
 -TELEMETA_DESCRIPTION = "Open web audio platform with semantics"
 -TELEMETA_LOGO = STATIC_URL + 'telemeta/images/logo_telemeta_2.png'
+ # -*- coding: utf-8 -*-
+ # Django settings for sandbox project.
+ import os, sys
+ from django.core.urlresolvers import reverse_lazy, reverse
+ import environ
+ # set default values and casting
+ env = environ.Env(DEBUG=(bool, False),
+                   CELERY_ALWAYS_EAGER=(bool, False),
+                   )
+ # Django settings for server project.
+ DEBUG = env('DEBUG') # False if not in os.environ
+ TEMPLATE_DEBUG = DEBUG
+ sys.dont_write_bytecode = True
+ ALLOWED_HOSTS = ['*']
+ ADMINS = (
+     ('Guillaume Pellerin', 'yomguy@parisson.com'),
+ )
+ MANAGERS = ADMINS
+ # Full filesystem path to the project.
+ #PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
+ PROJECT_ROOT = '/srv/app/'
+ DATABASES = {
+     'default': {
+         'ENGINE': env('ENGINE'),  # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
+         'USER': env('MYSQL_USER'),      # Not used with sqlite3.
+         'PASSWORD': env('MYSQL_PASSWORD'),  # Not used with sqlite3.
+         'NAME': env('MYSQL_DATABASE'),
+         'HOST': 'db',      # Set to empty string for localhost. Not used with sqlite3.
+         'PORT': '3306',      # Set to empty string for default. Not used with sqlite3.
+     }
+ }
+ # Local time zone for this installation. Choices can be found here:
+ # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
+ # although not all choices may be available on all operating systems.
+ # On Unix systems, a value of None will cause Django to use the same
+ # timezone as the operating system.
+ # If running in a Windows environment this must be set to the same as your
+ # system time zone.
+ TIME_ZONE = 'Europe/Paris'
+ # Language code for this installation. All choices can be found here:
+ # http://www.i18nguy.com/unicode/language-identifiers.html
+ #LANGUAGE_CODE = 'fr_FR'
+ LANGUAGES = [ ('fr', 'French'),
+               ('en', 'English'),
+               ('de', 'German'),
+               ('zh_CN', 'Simplified Chinese'),
+               ('ar_TN', 'Arabic'),
+               ('pt_BR', 'Portuguese'),
+ ]
+ SITE_ID = 1
+ # If you set this to False, Django will make some optimizations so as not
+ # to load the internationalization machinery.
+ USE_I18N = True
+ # If you set this to False, Django will not format dates, numbers and
+ # calendars according to the current locale
+ USE_L10N = True
+ # Absolute path to the directory that holds media.
+ # Example: "/home/media/media.lawrence.com/"
+ # MEDIA_ROOT = PROJECT_ROOT + '/media/'
+ #
+ # if not os.path.exists(MEDIA_ROOT):
+ #     os.makedirs(MEDIA_ROOT)
+ MEDIA_ROOT = '/srv/media/'
+ # 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/'
+ # Absolute path to the directory static files should be collected to.
+ # Don't put anything in this directory yourself; store your static files
+ # in apps' "static/" subdirectories and in STATICFILES_DIRS.
+ # Example: "/home/media/media.lawrence.com/static/"
+ # STATIC_ROOT = '/var/www/static'
+ STATIC_ROOT = '/srv/static/'
+ # URL prefix for static files.
+ # Example: "http://media.lawrence.com/static/"
+ STATIC_URL = '/static/'
+ # Additional locations of static files
+ STATICFILES_DIRS = (
+ # Put strings here, like "/home/html/static" or "C:/www/django/static".
+ # Always use forward slashes, even on Windows.
+ # Don't forget to use absolute paths, not relative paths.
+ )
+ # List of finder classes that know how to find static files in
+ # various locations.
+ STATICFILES_FINDERS = (
+ 'django.contrib.staticfiles.finders.FileSystemFinder',
+ 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+ 'djangobower.finders.BowerFinder',
+ #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+ )
+ # Make this unique, and don't share it with anybody.
+ SECRET_KEY = 'a8l7%06wr2k+3=%#*#@#rvop2mmzko)44%7k(zx%lls^ihm9^5'
+ # List of callables that know how to import templates from various sources.
+ TEMPLATE_LOADERS = (
+     'django.template.loaders.filesystem.Loader',
+     'django.template.loaders.app_directories.Loader',
+ #     'django.template.loaders.eggs.Loader',
+ )
+ MIDDLEWARE_CLASSES = (
+     # Manage Django URLs for AngularJS with django-angular
+     'djng.middleware.AngularUrlMiddleware',
+     'django.middleware.common.CommonMiddleware',
+     'django.contrib.sessions.middleware.SessionMiddleware',
+     'django.middleware.csrf.CsrfViewMiddleware',
+     'django.contrib.auth.middleware.AuthenticationMiddleware',
+     'django.contrib.messages.middleware.MessageMiddleware',
+     'django.middleware.locale.LocaleMiddleware',
+     # 'pagination.middleware.PaginationMiddleware',
+ )
+ ROOT_URLCONF = 'urls'
+ 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.
+ )
+ INSTALLED_APPS = (
+     'django.contrib.auth',
+     'django.contrib.contenttypes',
+     'django.contrib.sessions',
+     'django.contrib.sites',
+     'django.contrib.messages',
+     'suit',
+     'django.contrib.admin',
+     'django.contrib.staticfiles',
+     'django_extensions',
+     'telemeta',
+     'timeside.player',
+     'timeside.server',
+     'jsonrpc',
+     'south',
+     'sorl.thumbnail',
+     'timezones',
+     'jqchat',
+     'ipauth',
+     'extra_views',
+     'debug_toolbar',
+     'bootstrap3',
+     'bootstrap_pagination',
+     'googletools',
+     'registration',
+     'rest_framework',
+     'djcelery',
+     'haystack',
+     'djangobower',
+     'djng',
+     'saved_searches',
+ )
+ TEMPLATE_CONTEXT_PROCESSORS = (
+     'django.core.context_processors.request',
+     'django.contrib.auth.context_processors.auth',
+     "django.core.context_processors.i18n",
+     "django.core.context_processors.media",
+     'django.core.context_processors.static',
+     'django.contrib.messages.context_processors.messages',
+ )
+ AUTHENTICATION_BACKENDS = (
+     'django.contrib.auth.backends.ModelBackend',
+     'ipauth.backend.RangeBackend',
+ )
+ SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies"
 -TELEMETA_DOWNLOAD_ENABLED = True
++
++TELEMETA_ORGANIZATION = 'CREM-CNRS'
++TELEMETA_SUBJECTS = ('Ethnomusicology', 'Research')
++TELEMETA_DESCRIPTION = "Sound archives of the CNRS and the Musee de l'Homme. Research Centre of Ethnomusicology (CREM), University of Paris 10"
++TELEMETA_LOGO = STATIC_URL + 'telemeta/images/logo_crem.png'
+ TELEMETA_GMAP_KEY = 'ABQIAAAArg7eSfnfTkBRma8glnGrlxRVbMrhnNNvToCbZQtWdaMbZTA_3RRGObu5PDoiBImgalVnnLU2yN4RMA'
+ TELEMETA_CACHE_DIR = os.path.join(MEDIA_ROOT, 'cache')
+ TELEMETA_EXPORT_CACHE_DIR = os.path.join(MEDIA_ROOT, 'export')
+ TELEMETA_DATA_CACHE_DIR = os.path.join(TELEMETA_CACHE_DIR, 'data')
+ FILE_UPLOAD_TEMP_DIR = os.path.join(MEDIA_ROOT, 'tmp')
+ FILE_UPLOAD_PERMISSIONS = 0644
 -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 + ''
++TELEMETA_DOWNLOAD_ENABLED = False
+ TELEMETA_STREAMING_FORMATS = ('mp3', 'ogg')
+ TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'ogg', 'flac')
+ TELEMETA_PUBLIC_ACCESS_PERIOD = 51
+ TELEMETA_STRICT_CODE = False
++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}'
+ AUTH_PROFILE_MODULE = 'telemeta.userprofile'
+ SESSION_EXPIRE_AT_BROWSER_CLOSE = False
+ LOGIN_URL = '/login/'
+ LOGIN_REDIRECT_URL = '/desk/lists/'
+ EMAIL_HOST = 'localhost'
+ DEFAULT_FROM_EMAIL = 'webmaster@parisson.com'
+ TIMESIDE_DEFAULT_GRAPHER_ID = 'waveform_centroid'
+ TIMESIDE_DEFAULT_WAVEFORM_SIZES = ['346x130', '640x130']
+ TIMESIDE_AUTO_ZOOM = False
+ # Settings for django-bootstrap3
+ BOOTSTRAP3 = {
+     'set_required': True,
+     'set_placeholder': False,
+     'error_css_class': 'has-error',
+     'required_css_class': 'has-warning',
+     'javascript_in_head': True,
+ }
+ PAGINATION_SETTINGS = {
+     'PAGE_RANGE_DISPLAYED': 10,
+     'MARGIN_PAGES_DISPLAYED': 2,
+ }
+ DEBUG_TOOLBAR_PATCH_SETTINGS = False
+ DEBUG_TOOLBAR_PANELS = [
+     'debug_toolbar.panels.versions.VersionsPanel',
+     'debug_toolbar.panels.timer.TimerPanel',
+     'debug_toolbar.panels.settings.SettingsPanel',
+     'debug_toolbar.panels.headers.HeadersPanel',
+     'debug_toolbar.panels.request.RequestPanel',
+     'debug_toolbar.panels.sql.SQLPanel',
+     'debug_toolbar.panels.staticfiles.StaticFilesPanel',
+     'debug_toolbar.panels.templates.TemplatesPanel',
+     'debug_toolbar.panels.cache.CachePanel',
+     'debug_toolbar.panels.signals.SignalsPanel',
+     'debug_toolbar.panels.logging.LoggingPanel',
+     'debug_toolbar.panels.redirects.RedirectsPanel',
+ ]
+ SUIT_CONFIG = {
+     'ADMIN_NAME': 'Telemeta Admin'
+ }
+ # A sample logging configuration. The only tangible logging
+ # performed by this configuration is to send an email to
+ # the site admins on every HTTP 500 error when DEBUG=False.
+ # See http://docs.djangoproject.com/en/dev/topics/logging for
+ # more details on how to customize your logging configuration.
+ LOGGING = {
+     'version': 1,
+     'disable_existing_loggers': False,
+     'filters': {
+         'require_debug_false': {
+             '()': 'django.utils.log.RequireDebugFalse'
+         }
+     },
+     'handlers': {
+         'mail_admins': {
+             'level': 'ERROR',
+             'filters': ['require_debug_false'],
+             'class': 'django.utils.log.AdminEmailHandler'
+         }
+     },
+     'loggers': {
+         'django.request': {
+             'handlers': ['mail_admins'],
+             'level': 'ERROR',
+             'propagate': True,
+         },
+     }
+ }
+ BROKER_URL = env('BROKER_URL')
+ CELERY_IMPORTS = ("timeside.server.tasks",)
+ CELERY_RESULT_BACKEND = 'djcelery.backends.database:DatabaseBackend'
+ CELERY_TASK_SERIALIZER = 'json'
+ CELERY_RESULT_SERIALIZER = 'json'
+ CELERY_ACCEPT_CONTENT = ['application/json']
+ from worker import app
+ HAYSTACK_CONNECTIONS = {
+     'default': {
+         'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine',
+         'URL': 'http://search:9200/',
+         'INDEX_NAME': 'haystack',
+         'INLUDE_SPELLING': True,
+     },
+ }
+ HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
+ HAYSTACK_SEARCH_RESULTS_PER_PAGE = 50
+ BOWER_COMPONENTS_ROOT = '/srv/bower/'
+ BOWER_PATH = '/usr/local/bin/bower'
+ BOWER_INSTALLED_APPS = (
+     'jquery',
+     'jquery-migrate#~1.2.1',
+     'underscore',
+     'bootstrap',
+     'bootstrap-select#1.5.4',
+     'font-awesome#4.4.0',
+     'angular#1.2.26',
+     'angular-bootstrap-select',
+     'angular-resource#1.2.26',
+     'raphael',
+     'soundmanager#V2.97a.20150601',
+     'https://github.com/Parisson/loaders.git',
+     'https://github.com/Parisson/ui.git',
+     'jquery-ui',
+     'tablesorter',
+     'video.js',
+     'sass-bootstrap-glyphicons',
+ )
index 30c9d2ba53f24b41104c46a61e4cdb08e9f58c8e,159b94fd6ca8a5b488ae1a6ff2d8a1fcefad8fae..a3f529901a7147e001c0ba62c3599b50e0a7c897
@@@ -79,10 -75,9 +75,9 @@@ worker
  nginx:
    image: nginx
    ports:
 -    - "8000:80"
 +    - "8001:80"
    volumes:
-     - ./app/deploy/nginx-app.conf:/etc/nginx/conf.d/default.conf
-     - ./var/log/nginx/:/var/log/nginx
+     - ./etc/nginx.conf:/etc/nginx/conf.d/default.conf
    volumes_from:
      - data
    links:
diff --cc env/debug.env
index 0000000000000000000000000000000000000000,465d6beb4bed37ee63ca51e043996469cda2acd2..7059bd06039031fd5a7922143818d66afa7a6cdf
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,19 +1,19 @@@
 -MYSQL_ROOT_PASSWORD=mysecretpassword
+ # -- MYSQL DATABASE
+ ENGINE=django.db.backends.mysql
 -MYSQL_PASSWORD=mysecretpassword
++MYSQL_ROOT_PASSWORD=ItCydyatzix8
+ MYSQL_DATABASE=telemeta
+ MYSQL_USER=telemeta
 -DEBUG=True
++MYSQL_PASSWORD=iuvIlkyisFit2
+ # -- DJANGO
++DEBUG=False
+ SECRET_KEY=ghv8us2587n97dq&w$c((o5rj_$-9#d-8j#57y_a9og8wux1h7
+ # replace broker by localhost if you start your app outside docker-compose
+ BROKER_URL=redis://broker:6379/0
+ # If this is True, all tasks will be executed locally by blocking until the task returns.
+ CELERY_ALWAYS_EAGER=False