From ee8790081735218f6bde2bee9bbad8548c461ac7 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 26 Jan 2016 18:00:34 +0100
Subject: [PATCH] mv manifeste to sandbox, add real (blank) manifeste app, add
 eve psql restore and backup scripts

---
 app/deploy/start_app.sh                         |  6 +++---
 app/manage.py                                   |  2 +-
 app/manifeste/admin.py                          |  3 +++
 app/manifeste/models.py                         |  3 +++
 app/manifeste/tests.py                          |  3 +++
 app/manifeste/views.py                          |  3 +++
 .../migrations/blog => sandbox}/__init__.py     |  0
 app/{manifeste => sandbox}/local_settings.py    | 17 +++++++++++++++--
 .../conf => sandbox/migrations}/__init__.py     |  0
 .../migrations/blog/0001_initial.py             |  0
 .../migrations/blog/0002_auto_20150527_1555.py  |  0
 .../migrations/blog/0003_auto_20151223_1313.py  |  0
 .../migrations/blog}/__init__.py                |  0
 .../migrations/conf/0001_initial.py             |  0
 .../migrations/conf/0002_auto_20151223_1313.py  |  0
 .../migrations/conf}/__init__.py                |  0
 .../migrations/forms/0001_initial.py            |  0
 .../migrations/forms/0002_auto_20141227_0224.py |  0
 .../migrations/forms/0003_emailfield.py         |  0
 .../migrations/forms/0004_auto_20150517_0510.py |  0
 .../migrations/forms/0005_auto_20151223_1313.py |  0
 .../migrations/forms}/__init__.py               |  0
 .../migrations/galleries/0001_initial.py        |  0
 .../galleries/0002_auto_20141227_0224.py        |  0
 .../galleries/0003_auto_20151223_1313.py        |  0
 app/sandbox/migrations/galleries/__init__.py    |  0
 .../migrations/pages/0001_initial.py            |  0
 .../migrations/pages/0002_auto_20141227_0224.py |  0
 .../migrations/pages/0003_auto_20150527_1555.py |  0
 .../migrations/pages/0004_auto_20151223_1313.py |  0
 app/sandbox/migrations/pages/__init__.py        |  0
 app/{manifeste => sandbox}/settings.py          | 13 +++++++------
 app/{manifeste => sandbox}/urls.py              |  1 -
 app/wait.py                                     | 12 ++++++------
 app/wsgi.py                                     |  2 +-
 docker-compose.yml                              | 11 +++++++++++
 requirements.txt                                |  1 +
 37 files changed, 57 insertions(+), 20 deletions(-)
 create mode 100644 app/manifeste/admin.py
 create mode 100644 app/manifeste/models.py
 create mode 100644 app/manifeste/tests.py
 create mode 100644 app/manifeste/views.py
 rename app/{manifeste/migrations/blog => sandbox}/__init__.py (100%)
 rename app/{manifeste => sandbox}/local_settings.py (85%)
 rename app/{manifeste/migrations/conf => sandbox/migrations}/__init__.py (100%)
 rename app/{manifeste => sandbox}/migrations/blog/0001_initial.py (100%)
 rename app/{manifeste => sandbox}/migrations/blog/0002_auto_20150527_1555.py (100%)
 rename app/{manifeste => sandbox}/migrations/blog/0003_auto_20151223_1313.py (100%)
 rename app/{manifeste/migrations/forms => sandbox/migrations/blog}/__init__.py (100%)
 rename app/{manifeste => sandbox}/migrations/conf/0001_initial.py (100%)
 rename app/{manifeste => sandbox}/migrations/conf/0002_auto_20151223_1313.py (100%)
 rename app/{manifeste/migrations/galleries => sandbox/migrations/conf}/__init__.py (100%)
 rename app/{manifeste => sandbox}/migrations/forms/0001_initial.py (100%)
 rename app/{manifeste => sandbox}/migrations/forms/0002_auto_20141227_0224.py (100%)
 rename app/{manifeste => sandbox}/migrations/forms/0003_emailfield.py (100%)
 rename app/{manifeste => sandbox}/migrations/forms/0004_auto_20150517_0510.py (100%)
 rename app/{manifeste => sandbox}/migrations/forms/0005_auto_20151223_1313.py (100%)
 rename app/{manifeste/migrations/pages => sandbox/migrations/forms}/__init__.py (100%)
 rename app/{manifeste => sandbox}/migrations/galleries/0001_initial.py (100%)
 rename app/{manifeste => sandbox}/migrations/galleries/0002_auto_20141227_0224.py (100%)
 rename app/{manifeste => sandbox}/migrations/galleries/0003_auto_20151223_1313.py (100%)
 create mode 100644 app/sandbox/migrations/galleries/__init__.py
 rename app/{manifeste => sandbox}/migrations/pages/0001_initial.py (100%)
 rename app/{manifeste => sandbox}/migrations/pages/0002_auto_20141227_0224.py (100%)
 rename app/{manifeste => sandbox}/migrations/pages/0003_auto_20150527_1555.py (100%)
 rename app/{manifeste => sandbox}/migrations/pages/0004_auto_20151223_1313.py (100%)
 create mode 100644 app/sandbox/migrations/pages/__init__.py
 rename app/{manifeste => sandbox}/settings.py (98%)
 rename app/{manifeste => sandbox}/urls.py (99%)

diff --git a/app/deploy/start_app.sh b/app/deploy/start_app.sh
index 84b21476..b8ea0e30 100644
--- a/app/deploy/start_app.sh
+++ b/app/deploy/start_app.sh
@@ -16,7 +16,7 @@ uid='www-data'
 gid='www-data'
 
 # Staging
-#pip install mezzanine_instagram
+pip install psycopg2
 
 chown -R $uid:$gid $media
 
@@ -24,10 +24,10 @@ chown -R $uid:$gid $media
 sh $app/deploy/wait.sh
 
 # waiting for available database
-python $app/wait.py
+# python $app/wait.py
 
 # django init
-python $manage syncdb --noinput
+# python $manage syncdb --noinput
 python $manage migrate --noinput
 python $manage collectstatic --noinput
 
diff --git a/app/manage.py b/app/manage.py
index e9d335d4..7102e85f 100755
--- a/app/manage.py
+++ b/app/manage.py
@@ -6,7 +6,7 @@ if __name__ == "__main__":
 
     from mezzanine.utils.conf import real_project_name
 
-    settings_module = "%s.settings" % real_project_name("manifeste")
+    settings_module = "%s.settings" % real_project_name("sandbox")
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", settings_module)
 
     from django.core.management import execute_from_command_line
diff --git a/app/manifeste/admin.py b/app/manifeste/admin.py
new file mode 100644
index 00000000..8c38f3f3
--- /dev/null
+++ b/app/manifeste/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/app/manifeste/models.py b/app/manifeste/models.py
new file mode 100644
index 00000000..71a83623
--- /dev/null
+++ b/app/manifeste/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/app/manifeste/tests.py b/app/manifeste/tests.py
new file mode 100644
index 00000000..7ce503c2
--- /dev/null
+++ b/app/manifeste/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/app/manifeste/views.py b/app/manifeste/views.py
new file mode 100644
index 00000000..91ea44a2
--- /dev/null
+++ b/app/manifeste/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
diff --git a/app/manifeste/migrations/blog/__init__.py b/app/sandbox/__init__.py
similarity index 100%
rename from app/manifeste/migrations/blog/__init__.py
rename to app/sandbox/__init__.py
diff --git a/app/manifeste/local_settings.py b/app/sandbox/local_settings.py
similarity index 85%
rename from app/manifeste/local_settings.py
rename to app/sandbox/local_settings.py
index 7d8fc654..8c113132 100644
--- a/app/manifeste/local_settings.py
+++ b/app/sandbox/local_settings.py
@@ -6,6 +6,8 @@ DEBUG = True
 SECRET_KEY = "+3b01&_6_m@@yb4f06$s0zno8vkybh81nbuj_q(xzk+xeih1+s"
 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'.
@@ -14,7 +16,16 @@ DATABASES = {
         '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': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'eve',
+        'USER': 'postgres',
+        'PASSWORD': 'mysecretpassword',
+        'HOST': 'pgdb',
+        'PORT': '5432',
+    },
+
 }
 
 # EXTENSIONS AND FORMATS
@@ -47,6 +58,8 @@ EMAIL_HOST = 'smtp.ircam.fr'
 EMAIL_PORT = '25'
 DEFAULT_FROM_EMAIL = 'manifeste2016@ircam.fr'
 EMAIL_SUBJECT_PREFIX = "IRCAM Manifeste 2016"
- 
+
 SITE_TITLE = 'Manifeste 2016'
 SITE_TAGLINE = 'Festival 2 juin | 2 juillet 2016'
+
+SILENCED_SYSTEM_CHECKS = ['fields.W342',]
diff --git a/app/manifeste/migrations/conf/__init__.py b/app/sandbox/migrations/__init__.py
similarity index 100%
rename from app/manifeste/migrations/conf/__init__.py
rename to app/sandbox/migrations/__init__.py
diff --git a/app/manifeste/migrations/blog/0001_initial.py b/app/sandbox/migrations/blog/0001_initial.py
similarity index 100%
rename from app/manifeste/migrations/blog/0001_initial.py
rename to app/sandbox/migrations/blog/0001_initial.py
diff --git a/app/manifeste/migrations/blog/0002_auto_20150527_1555.py b/app/sandbox/migrations/blog/0002_auto_20150527_1555.py
similarity index 100%
rename from app/manifeste/migrations/blog/0002_auto_20150527_1555.py
rename to app/sandbox/migrations/blog/0002_auto_20150527_1555.py
diff --git a/app/manifeste/migrations/blog/0003_auto_20151223_1313.py b/app/sandbox/migrations/blog/0003_auto_20151223_1313.py
similarity index 100%
rename from app/manifeste/migrations/blog/0003_auto_20151223_1313.py
rename to app/sandbox/migrations/blog/0003_auto_20151223_1313.py
diff --git a/app/manifeste/migrations/forms/__init__.py b/app/sandbox/migrations/blog/__init__.py
similarity index 100%
rename from app/manifeste/migrations/forms/__init__.py
rename to app/sandbox/migrations/blog/__init__.py
diff --git a/app/manifeste/migrations/conf/0001_initial.py b/app/sandbox/migrations/conf/0001_initial.py
similarity index 100%
rename from app/manifeste/migrations/conf/0001_initial.py
rename to app/sandbox/migrations/conf/0001_initial.py
diff --git a/app/manifeste/migrations/conf/0002_auto_20151223_1313.py b/app/sandbox/migrations/conf/0002_auto_20151223_1313.py
similarity index 100%
rename from app/manifeste/migrations/conf/0002_auto_20151223_1313.py
rename to app/sandbox/migrations/conf/0002_auto_20151223_1313.py
diff --git a/app/manifeste/migrations/galleries/__init__.py b/app/sandbox/migrations/conf/__init__.py
similarity index 100%
rename from app/manifeste/migrations/galleries/__init__.py
rename to app/sandbox/migrations/conf/__init__.py
diff --git a/app/manifeste/migrations/forms/0001_initial.py b/app/sandbox/migrations/forms/0001_initial.py
similarity index 100%
rename from app/manifeste/migrations/forms/0001_initial.py
rename to app/sandbox/migrations/forms/0001_initial.py
diff --git a/app/manifeste/migrations/forms/0002_auto_20141227_0224.py b/app/sandbox/migrations/forms/0002_auto_20141227_0224.py
similarity index 100%
rename from app/manifeste/migrations/forms/0002_auto_20141227_0224.py
rename to app/sandbox/migrations/forms/0002_auto_20141227_0224.py
diff --git a/app/manifeste/migrations/forms/0003_emailfield.py b/app/sandbox/migrations/forms/0003_emailfield.py
similarity index 100%
rename from app/manifeste/migrations/forms/0003_emailfield.py
rename to app/sandbox/migrations/forms/0003_emailfield.py
diff --git a/app/manifeste/migrations/forms/0004_auto_20150517_0510.py b/app/sandbox/migrations/forms/0004_auto_20150517_0510.py
similarity index 100%
rename from app/manifeste/migrations/forms/0004_auto_20150517_0510.py
rename to app/sandbox/migrations/forms/0004_auto_20150517_0510.py
diff --git a/app/manifeste/migrations/forms/0005_auto_20151223_1313.py b/app/sandbox/migrations/forms/0005_auto_20151223_1313.py
similarity index 100%
rename from app/manifeste/migrations/forms/0005_auto_20151223_1313.py
rename to app/sandbox/migrations/forms/0005_auto_20151223_1313.py
diff --git a/app/manifeste/migrations/pages/__init__.py b/app/sandbox/migrations/forms/__init__.py
similarity index 100%
rename from app/manifeste/migrations/pages/__init__.py
rename to app/sandbox/migrations/forms/__init__.py
diff --git a/app/manifeste/migrations/galleries/0001_initial.py b/app/sandbox/migrations/galleries/0001_initial.py
similarity index 100%
rename from app/manifeste/migrations/galleries/0001_initial.py
rename to app/sandbox/migrations/galleries/0001_initial.py
diff --git a/app/manifeste/migrations/galleries/0002_auto_20141227_0224.py b/app/sandbox/migrations/galleries/0002_auto_20141227_0224.py
similarity index 100%
rename from app/manifeste/migrations/galleries/0002_auto_20141227_0224.py
rename to app/sandbox/migrations/galleries/0002_auto_20141227_0224.py
diff --git a/app/manifeste/migrations/galleries/0003_auto_20151223_1313.py b/app/sandbox/migrations/galleries/0003_auto_20151223_1313.py
similarity index 100%
rename from app/manifeste/migrations/galleries/0003_auto_20151223_1313.py
rename to app/sandbox/migrations/galleries/0003_auto_20151223_1313.py
diff --git a/app/sandbox/migrations/galleries/__init__.py b/app/sandbox/migrations/galleries/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/app/manifeste/migrations/pages/0001_initial.py b/app/sandbox/migrations/pages/0001_initial.py
similarity index 100%
rename from app/manifeste/migrations/pages/0001_initial.py
rename to app/sandbox/migrations/pages/0001_initial.py
diff --git a/app/manifeste/migrations/pages/0002_auto_20141227_0224.py b/app/sandbox/migrations/pages/0002_auto_20141227_0224.py
similarity index 100%
rename from app/manifeste/migrations/pages/0002_auto_20141227_0224.py
rename to app/sandbox/migrations/pages/0002_auto_20141227_0224.py
diff --git a/app/manifeste/migrations/pages/0003_auto_20150527_1555.py b/app/sandbox/migrations/pages/0003_auto_20150527_1555.py
similarity index 100%
rename from app/manifeste/migrations/pages/0003_auto_20150527_1555.py
rename to app/sandbox/migrations/pages/0003_auto_20150527_1555.py
diff --git a/app/manifeste/migrations/pages/0004_auto_20151223_1313.py b/app/sandbox/migrations/pages/0004_auto_20151223_1313.py
similarity index 100%
rename from app/manifeste/migrations/pages/0004_auto_20151223_1313.py
rename to app/sandbox/migrations/pages/0004_auto_20151223_1313.py
diff --git a/app/sandbox/migrations/pages/__init__.py b/app/sandbox/migrations/pages/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/app/manifeste/settings.py b/app/sandbox/settings.py
similarity index 98%
rename from app/manifeste/settings.py
rename to app/sandbox/settings.py
index b7e95642..ba1352dc 100644
--- a/app/manifeste/settings.py
+++ b/app/sandbox/settings.py
@@ -201,10 +201,10 @@ INSTALLED_APPS = (
     "django.contrib.redirects",
     "django.contrib.sessions",
     "django.contrib.sites",
-    "django.contrib.sitemaps",
     "django.contrib.staticfiles",
     "mezzanine.boot",
     "mezzanine.conf",
+    "django.contrib.sitemaps",
     "mezzanine.core",
     "mezzanine.generic",
     "mezzanine.pages",
@@ -214,15 +214,16 @@ INSTALLED_APPS = (
     "mezzanine.twitter",
     "mezzanine.accounts",
     # "mezzanine.mobile",
+    "eve",
 )
 
 # Add Migration Module path see : https://github.com/stephenmcd/mezzanine/blob/master/docs/model-customization.rst#field-injection-caveats
 MIGRATION_MODULES = {
-    "blog": "manifeste.migrations.blog",
-    "forms": "manifeste.migrations.forms",
-    "galleries": "manifeste.migrations.galleries",
-    "pages": "manifeste.migrations.pages",
-    "conf": "manifeste.migrations.conf",
+    "blog": "sandbox.migrations.blog",
+    "forms": "sandbox.migrations.forms",
+    "galleries": "sandbox.migrations.galleries",
+    "pages": "sandbox.migrations.pages",
+    "conf": "sandbox.migrations.conf",
 }
 
 # List of processors used by RequestContext to populate the context.
diff --git a/app/manifeste/urls.py b/app/sandbox/urls.py
similarity index 99%
rename from app/manifeste/urls.py
rename to app/sandbox/urls.py
index c1ae1c04..e9ecdb81 100644
--- a/app/manifeste/urls.py
+++ b/app/sandbox/urls.py
@@ -7,7 +7,6 @@ from django.contrib import admin
 from mezzanine.core.views import direct_to_template
 from mezzanine.conf import settings
 
-
 admin.autodiscover()
 
 # Add the urlpatterns for any custom Django applications here.
diff --git a/app/wait.py b/app/wait.py
index eead53c7..c70dc753 100644
--- a/app/wait.py
+++ b/app/wait.py
@@ -6,9 +6,9 @@ from django.core.management import call_command
 up = False
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "sandbox.settings")
 
-while not up:
-    try:
-        call_command('syncdb', interactive=False)
-        up = True
-    except:
-        time.sleep(1)
+# while not up:
+#     try:
+call_command('syncdb', interactive=False)
+    #     up = True
+    # except:
+    #     time.sleep(1)
diff --git a/app/wsgi.py b/app/wsgi.py
index faa39cf2..aa519c45 100644
--- a/app/wsgi.py
+++ b/app/wsgi.py
@@ -11,7 +11,7 @@ import os
 from django.core.wsgi import get_wsgi_application
 from mezzanine.utils.conf import real_project_name
 
-settings_module = "%s.settings" % real_project_name("manifeste")
+settings_module = "%s.settings" % real_project_name("sandbox")
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", settings_module)
 
diff --git a/docker-compose.yml b/docker-compose.yml
index a3270f4c..f9c16106 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,12 +31,22 @@ 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
 
+pgdb:
+  image: postgres
+  volumes_from:
+    - data
+  environment:
+    - POSTGRES_PASSWORD=mysecretpassword
+    - POSTGRES_USER=postgres
+
 app:
   build: .
   command: /bin/sh deploy/start_app.sh
@@ -48,6 +58,7 @@ app:
     - "8000"
   links:
     - db
+    - pgdb
 
 nginx:
   image: nginx
diff --git a/requirements.txt b/requirements.txt
index 34d3b7e5..31036959 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,3 +9,4 @@ mezzanine==4.0.1
 django-modeltranslation
 django-meta
 mezzanine-bsbanners
+psycopg2
-- 
2.39.5