goto postgres

diff --git a/app/local_settings.py b/app/local_settings.py
index 5b6f5d61a08e9c4be1ed95ae0426f4fcf50c3e02..8a3e3906cf752e9aae567fe7ff1f953861b93c4e 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -11,15 +11,15 @@ NEVERCACHE_KEY = "m)u^%r@uh#r3wu0&$=#$1ogx)uy4hv93^2lt%c3@xi=^gifoj8paozijdihaze
 # DATABASE_ROUTERS = ['eve.routers.EveRouter',]
 
 DATABASES = {
-    'default': {
-     'ENGINE': 'django.db.backends.mysql',  # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
-         'USER': os.environ.get('DB_ENV_MYSQL_USER'),      # Not used with sqlite3.
-         'PASSWORD': os.environ.get('DB_ENV_MYSQL_PASSWORD'),  # Not used with sqlite3.
-         'NAME': os.environ.get('DB_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.
-    },
     'eve': {
+    # 'default': {
+    #  'ENGINE': 'django.db.backends.mysql',  # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
+    #      'USER': os.environ.get('DB_ENV_MYSQL_USER'),      # Not used with sqlite3.
+    #      'PASSWORD': os.environ.get('DB_ENV_MYSQL_PASSWORD'),  # Not used with sqlite3.
+    #      'NAME': os.environ.get('DB_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.
+    # },
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
         'NAME': 'eve',
         'USER': 'eve',
@@ -27,14 +27,15 @@ DATABASES = {
         'HOST': 'pgdb',
         'PORT': '5432',
     },
-    #'eve': {
-    #     'ENGINE': 'django.db.backends.postgresql_psycopg2',
-    #     'NAME': 'eve',
-    #     'USER': 'django',
-    #     'PASSWORD': 'q2nqzt0WGnwWé,256',
-    #     'HOST': 'eve.ircam.fr',
-    #     'PORT': '5432',
-    #},
+
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'postgres',
+        'USER': 'postgres',
+        'PASSWORD': os.environ.get('DB_ENV_POSTGRES_PASSWORD'),
+        'HOST': 'db',
+        'PORT': '5432',
+    },
 
 }
 
@@ -69,11 +70,11 @@ FILEBROWSER_SELECT_FORMATS = {
 
 EMAIL_HOST = 'smtp.ircam.fr'
 EMAIL_PORT = '25'
-DEFAULT_FROM_EMAIL = 'manifeste2016@ircam.fr'
-EMAIL_SUBJECT_PREFIX = "IRCAM Manifeste 2016"
+DEFAULT_FROM_EMAIL = 'www@ircam.fr'
+EMAIL_SUBJECT_PREFIX = "[IRCAM WWW]"
 
-SITE_TITLE = 'Manifeste 2016'
-SITE_TAGLINE = 'Festival 2 juin | 2 juillet 2016'
+SITE_TITLE = 'IRCAM'
+SITE_TAGLINE = 'Institut de Recherche et de Coordination Acoustique et Musique'
 
 SILENCED_SYSTEM_CHECKS = ['fields.W342',]
 
@@ -116,6 +117,10 @@ BREAKING_NEWS_FEATURED_ID = 4
 
 BLOG_POST_PER_PAGE = 200
 
+# The numeric mode to set newly-uploaded files to. The value should be
+# a mode you'd pass directly to os.chmod.
+FILE_UPLOAD_PERMISSIONS = 0o664
+FILE_UPLOAD_TEMP_DIR = '/srv/media/uploads/tmp/'
 FILEBROWSER_MAX_UPLOAD_SIZE = 512000000
 
 if DEBUG:

diff --git a/app/settings.py b/app/settings.py
index 18b8e05f7326e4f7c003ff101406c748a0cc8ad9..40695acfc759ef2f3981627881045e43b23023a6 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -124,11 +124,6 @@ USE_L10N = True
 
 AUTHENTICATION_BACKENDS = ("mezzanine.core.auth_backends.MezzanineBackend",)
 
-# The numeric mode to set newly-uploaded files to. The value should be
-# a mode you'd pass directly to os.chmod.
-FILE_UPLOAD_PERMISSIONS = 0o644
-
-# MAX_UPLOAD_SIZE = 429916160
 
 #############
 # DATABASES #

diff --git a/docker-compose.yml b/docker-compose.yml
index 6099fbda2bdf9115960ecf108fcd3b49930d3df8..8566dddf1a6be22ea37f32c0486dd48e279ae5a9 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,18 +28,28 @@ data:
     - /srv/bower
   command: "true"
 
+# db:
+#   image: mariadb
+#   volumes_from:
+#     - data
+#   volumes:
+#     - ./scripts/:/srv/scripts
+#     - ./data/mysql/:/var/lib/mysql
+#   environment:
+#     - MYSQL_ROOT_PASSWORD=hyRob0otlaz4
+#     - MYSQL_DATABASE=ircam-www
+#     - MYSQL_USER=ircam
+#     - MYSQL_PASSWORD=Onukifsid7
+
 db:
-  image: mariadb
+  image: postgres
   volumes_from:
     - data
   volumes:
     - ./scripts/:/srv/scripts
-    - ./data/mysql/:/var/lib/mysql
+    - ./data/postgresql/data/:/var/lib/postgresql/data
   environment:
-    - MYSQL_ROOT_PASSWORD=hyRob0otlaz4
-    - MYSQL_DATABASE=ircam-www
-    - MYSQL_USER=ircam
-    - MYSQL_PASSWORD=Onukifsid7
+    - POSTGRES_PASSWORD=hyRob0otlaz4
 
 app:
   build: .