From: Guillaume Pellerin Date: Mon, 8 Feb 2016 17:58:54 +0000 (+0100) Subject: add postgresql config (commented) fir testing, add apps X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b4d44dc266536b6033a4b6daedc232ee7084e03e;p=mezzo.git add postgresql config (commented) fir testing, add apps --- diff --git a/Dockerfile b/Dockerfile index dfc28bca..0e3d9c3e 100644 --- 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 d986ac42..43f7e9c0 100644 --- 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 2f09b566..6956d449 100644 --- 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 0fbb613b..2462c6e0 100644 --- 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 7323c1d4..0cf322b2 100644 --- 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 e69de29b..5e6ac043 100644 --- 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 5bd91532..3dd47911 100644 --- 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