cleanup

diff --git a/app/local_settings.py b/app/local_settings.py
index 65bab1885d2a0667e962af214d6965bb6cc551bf..fdf1d784c46f6006088320c776b03e41b8b79193 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -11,23 +11,6 @@ NEVERCACHE_KEY = "m)u^%r@uh#r3wu0&$=#$1ogx)uy4hv93^2lt%c3@xi=^gifoj8paozijdihaze
 # DATABASE_ROUTERS = ['eve.routers.EveRouter',]
 
 DATABASES = {
-    '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',
-        'PASSWORD': 'HmazS2frT',
-        'HOST': 'pgdb',
-        'PORT': '5432',
-    },
-
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
         'NAME': 'postgres',
@@ -36,7 +19,14 @@ DATABASES = {
         'HOST': 'db',
         'PORT': '5432',
     },
-
+    'eve': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'eve',
+        'USER': 'eve',
+        'PASSWORD': 'HmazS2frT',
+        'HOST': 'pgdb',
+        'PORT': '5432',
+    },
 }
 
 # DATABASE_ROUTERS = ['eve.routers.EveRouter',]

diff --git a/docker-compose.yml b/docker-compose.yml
index 8566dddf1a6be22ea37f32c0486dd48e279ae5a9..9c7c3a8a8e937dd2d0aad944003aac1dc099dad4 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,19 +28,6 @@ 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: postgres
   volumes_from: