add postgresql config (commented) fir testing, add apps

diff --git a/Dockerfile b/Dockerfile
index dfc28bca4fe6b95cab3f491d4bde269296e9f736..0e3d9c3e8e1371e5efe98fa0df17d2e55a3e8ee3 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,5 +18,5 @@ WORKDIR /srv/app
 ADD requirements.txt /srv/app/
 RUN pip install -r requirements.txt
 
-# ADD requirements-dev.txt /srv/app/
-# RUN pip install -r requirements-dev.txt --src /srv/src
+ADD requirements-dev.txt /srv/app/
+RUN pip install -r requirements-dev.txt --src /srv/src

diff --git a/app/deploy/start_app.sh b/app/deploy/start_app.sh
index d986ac42670237277cdd87c83437c878989580bf..43f7e9c0282fa6e7b65fd52a036c5551155dd401 100644 (file)
--- a/app/deploy/start_app.sh
+++ b/app/deploy/start_app.sh
@@ -24,7 +24,7 @@ chown -R $uid:$gid $media
 sh $app/deploy/wait.sh
 
 # waiting for available database
-# python $app/wait.py
+python $app/wait.py
 # python $manage wait-for-db-connection
 
 # django init

diff --git a/app/sandbox/local_settings.py b/app/sandbox/local_settings.py
index 2f09b566bd5f7a2962ab7e31a5e6b1c524667f26..6956d449a14f9a4861824f824b624b027132ca27 100644 (file)
--- a/app/sandbox/local_settings.py
+++ b/app/sandbox/local_settings.py
@@ -10,22 +10,22 @@ NEVERCACHE_KEY = "l11tr%#!uc@+%$51(&+%=&z6h9yrw42(jpcj$3_&6evtu6hl%z"
 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.
+    },
     # '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'),
+    #     'ENGINE': 'django.db.backends.postgresql_psycopg2',  # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
+    #     'USER': 'postgres',      # Not used with sqlite3.
+    #     'PASSWORD': 'mysecretpassword',  # Not used with sqlite3.
+    #     'NAME': 'manifeste',
     #     'HOST': 'db',      # Set to empty string for localhost. Not used with sqlite3.
-    #     'PORT': '3306',      # Set to empty string for default. Not used with sqlite3.
+    #     'PORT': '5432',      # Set to empty string for default. Not used with sqlite3.
     # },
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',  # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
-        'USER': 'postgres',      # Not used with sqlite3.
-        'PASSWORD': 'mysecretpassword',  # Not used with sqlite3.
-        'NAME': 'manifeste',
-        'HOST': 'db',      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '5432',      # Set to empty string for default. Not used with sqlite3.
-    },
     'eve': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
         'NAME': 'eve',

diff --git a/app/sandbox/settings.py b/app/sandbox/settings.py
index 0fbb613bfe4c1bf99bce0b574721678447e046eb..2462c6e076db9c6bd315be053850ffa0e26d6fc7 100644 (file)
--- a/app/sandbox/settings.py
+++ b/app/sandbox/settings.py
@@ -194,7 +194,7 @@ TEMPLATE_DIRS = (os.path.join(PROJECT_ROOT, "templates"),)
 # APPLICATIONS #
 ################
 
-INSTALLED_APPS = (
+INSTALLED_APPS = [
     "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",
@@ -216,7 +216,8 @@ INSTALLED_APPS = (
     # "mezzanine.mobile",
     # "eve",
     "festival",
-)
+    "meta",
+]
 
 # Add Migration Module path see : https://github.com/stephenmcd/mezzanine/blob/master/docs/model-customization.rst#field-injection-caveats
 MIGRATION_MODULES = {
@@ -304,7 +305,7 @@ except ImportError as e:
 
 
 ####################
-# DYNAMIC SETTINGS #
+# DYNAMIC S ETTINGS #
 ####################
 
 # set_dynamic_settings() will rewrite globals based on what has been

diff --git a/docker-compose.yml b/docker-compose.yml
index 7323c1d482d17c6ae3d0dff0f201058c00d970c3..0cf322b2bca7f47a95d2a51284af863b95a1de19 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,40 +27,40 @@ data:
      - ./data/backup/:/srv/backup
   command: "true"
 
-# db:
-#   image: mariadb
-#   volumes_from:
-#     - data
-#   volumes:
-#     - ./data/var/lib/mysql/:/var/lib/mysql
-#   environment:
-#     - MYSQL_ROOT_PASSWORD=hyRob0otlaz4
-#     - MYSQL_DATABASE=manifeste
-#     - MYSQL_USER=manifeste
-#     - MYSQL_PASSWORD=Onukifsid7
-
 db:
-  image: postgres
-  volumes:
-    - ./data/var/lib/postgresql/manifeste/data/:/var/lib/postgresql/data
+  image: mariadb
   volumes_from:
     - data
+  volumes:
+    - ./data/var/lib/mysql/:/var/lib/mysql
   environment:
-    - POSTGRES_PASSWORD=mysecretpassword
-    - POSTGRES_USER=postgres
-    - POSTGRES_DB=manifeste
+    - MYSQL_ROOT_PASSWORD=hyRob0otlaz4
+    - MYSQL_DATABASE=manifeste
+    - MYSQL_USER=manifeste
+    - MYSQL_PASSWORD=Onukifsid7
+
+# db:
+#   image: postgres
+#   volumes:
+#     - ./data/var/lib/postgresql/manifeste/data/:/var/lib/postgresql/data
+#   volumes_from:
+#     - data
+#   environment:
+#     - POSTGRES_PASSWORD=mysecretpassword
+#     - POSTGRES_USER=postgres
+#     - POSTGRES_DB=manifeste
 
 
-pgdb:
-  image: postgres
-  volumes:
-    - ./data/var/lib/postgresql/eve/data/:/var/lib/postgresql/data
-  volumes_from:
-    - data
-  environment:
-    - POSTGRES_PASSWORD=mysecretpassword
-    - POSTGRES_USER=postgres
-    - POSTGRES_DB=eve
+# pgdb:
+#   image: postgres
+#   volumes:
+#     - ./data/var/lib/postgresql/eve/data/:/var/lib/postgresql/data
+#   volumes_from:
+#     - data
+#   environment:
+#     - POSTGRES_PASSWORD=mysecretpassword
+#     - POSTGRES_USER=postgres
+#     - POSTGRES_DB=eve
 
 app:
   build: .
@@ -73,7 +73,7 @@ app:
     - "8000"
   links:
     - db
-    - pgdb
+    # - pgdb
 
 nginx:
   image: nginx

diff --git a/requirements-dev.txt b/requirements-dev.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5e6ac04362ed2d3ed26c598834991959da3d48f9 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -0,0 +1,2 @@
+mezzanine-agenda
+mezzanine_people

diff --git a/requirements.txt b/requirements.txt
index 5bd91532c84945da0d16ef21b3e76df3f20ae9d0..3dd47911afaf6db4356766bb73fbd49870642d00 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,6 +8,4 @@ Django==1.8.7
 mezzanine==4.0.1
 django-modeltranslation
 django-meta
-mezzanine-bsbanners
 psycopg2
-#django-location-field