Skip to content

Commit

Permalink
settings para deploy en openshift
Browse files Browse the repository at this point in the history
  • Loading branch information
reyiyo committed Apr 2, 2016
1 parent fdb174d commit b5ff060
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 379 deletions.
24 changes: 24 additions & 0 deletions .openshift/action_hooks/deploy
@@ -0,0 +1,24 @@
#!/bin/bash

source $OPENSHIFT_HOMEDIR/python/virtenv/bin/activate

echo "Executing 'python $OPENSHIFT_REPO_DIR/manage.py migrate --noinput'"
python "$OPENSHIFT_REPO_DIR"/manage.py migrate --noinput

echo "Executing 'python $OPENSHIFT_REPO_DIR/manage.py syncdb --noinput'"
python "$OPENSHIFT_REPO_DIR"/manage.py syncdb --noinput

echo "Executing 'python $OPENSHIFT_REPO_DIR/manage.py collectstatic --noinput'"
python "$OPENSHIFT_REPO_DIR"/manage.py collectstatic --noinput

echo "Executing 'python $OPENSHIFT_REPO_DIR/manage.py loaddata manager/initial_data/initial_data.json --noinput'"
python "$OPENSHIFT_REPO_DIR"/manage.py loaddata manager/initial_data/initial_data.json --noinput

echo "Executing 'python $OPENSHIFT_REPO_DIR/manage.py loaddata manager/initial_data/social.json --noinput'"
python "$OPENSHIFT_REPO_DIR"/manage.py loaddata manager/initial_data/social.json --noinput

echo "Executing 'django-admin makemessages --locale=es'"
django-admin makemessages --locale=es

echo "Executing 'django-admin compilemessages'"
django-admin compilemessages
80 changes: 40 additions & 40 deletions eventoL/settings.py
Expand Up @@ -7,6 +7,8 @@
For the full list of settings and their values, see
https://docs.djangoproject.com/en/1.6/ref/settings/
"""
import socket

import django.conf.global_settings as DEFAULT_SETTINGS
from easy_thumbnails.conf import Settings as thumbnail_settings
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
Expand All @@ -15,22 +17,25 @@

BASE_DIR = os.path.dirname(os.path.dirname(__file__))

MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
ON_OPENSHIFT = 'OPENSHIFT_REPO_DIR' in os.environ

MEDIA_URL = '/media/'
SECRET_KEY = os.environ.get('OPENSHIFT_SECRET_TOKEN', default='!a44%)(r2!1wp89@ds(tqzpo#f0qgfxomik)a$16v5v@b%)ecu')

# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = not ON_OPENSHIFT

# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = '!a44%)(r2!1wp89@ds(tqzpo#f0qgfxomik)a$16v5v@b%)ecu'
if ON_OPENSHIFT and DEBUG:
print("*** Warning - Debug mode is on ***")

# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
TEMPLATE_DEBUG = not ON_OPENSHIFT

TEMPLATE_DEBUG = True
if ON_OPENSHIFT:
ALLOWED_HOSTS = [os.environ['OPENSHIFT_APP_DNS'], socket.gethostname()]
else:
ALLOWED_HOSTS = []

ALLOWED_HOSTS = []
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/

# Application definition

Expand Down Expand Up @@ -85,11 +90,11 @@
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'eventol',
'USER': 'eventol',
'PASSWORD': 'secret',
'HOST': 'localhost',
'PORT': '5432',
'NAME': os.environ.get('OPENSHIFT_APP_NAME', default='eventol'),
'USER': os.environ.get('OPENSHIFT_POSTGRESQL_DB_USERNAME', default='eventol'),
'PASSWORD': os.environ.get('OPENSHIFT_POSTGRESQL_DB_PASSWORD', default='secret'),
'HOST': os.environ.get('OPENSHIFT_POSTGRESQL_DB_HOST', default='localhost'),
'PORT': os.environ.get('OPENSHIFT_POSTGRESQL_DB_PORT', default='5432'),
}
}

Expand Down Expand Up @@ -123,24 +128,23 @@
# https://docs.djangoproject.com/en/1.6/howto/static-files/

STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, '..', 'manager', 'static')

TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + (
'django.core.context_processors.request',
)
if 'OPENSHIFT_REPO_DIR' in os.environ:
STATIC_ROOT = os.path.join(os.environ.get('OPENSHIFT_REPO_DIR'), 'wsgi', 'static')
else:
STATIC_ROOT = os.path.join(BASE_DIR, '..', 'manager', 'static')

CITIES_FILES = {
'city': {
'filename': 'AR.zip',
'urls': ['http://download.geonames.org/export/dump/' + '{filename}']
},
}

CITIES_LOCALES = ['es-AR']
if 'OPENSHIFT_DATA_DIR' in os.environ:
MEDIA_ROOT = os.path.join(os.environ.get('OPENSHIFT_REPO_DIR'), 'wsgi', 'static', 'media')
else:
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')

CITIES_POSTAL_CODES = ['ARG']
MEDIA_URL = '/media/'

CITIES_PLUGINS = []
TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + (
'django.core.context_processors.request',
)

LOGGING = {
'version': 1,
Expand All @@ -158,11 +162,6 @@
},
},
'loggers': {
'cities': {
'handlers': ['log_to_stdout'],
'level': 'INFO',
'propagate': True,
},
'django': {
'handlers': ['log_to_stdout'],
'propagate': True,
Expand All @@ -171,12 +170,13 @@
}
}

EMAIL_HOST = 'smtp.gmail.com'
EMAIL_PORT = '587'
EMAIL_HOST_USER = 'YOUR USERNAME'
EMAIL_HOST_PASSWORD = 'YOUR PASSWORD'
EMAIL_USE_TLS = True
EMAIL_FROM = 'FROM@YOURACCOUNT'
EMAIL_HOST = os.environ.get('EVENTOL_EMAIL_HOST', default='smtp.gmail.com')
EMAIL_PORT = os.environ.get('EVENTOL_EMAIL_PORT', default='587')
EMAIL_HOST_USER = os.environ.get('EVENTOL_EMAIL_HOST_USER', default='YOUR USERNAME')
EMAIL_HOST_PASSWORD = os.environ.get('EVENTOL_EMAIL_HOST_PASSWORD', default='YOUR PASSWORD')
EMAIL_USE_TLS = os.environ.get('EVENTOL_EMAIL_USE_TLS', default=True)
EMAIL_FROM = os.environ.get('EVENTOL_EMAIL_FROM', default='FROM@YOURACCOUNT')

LOGIN_URL = '/accounts/login/'

OptimizeSettings.THUMBNAIL_OPTIMIZE_COMMAND = {
Expand All @@ -185,7 +185,7 @@
'jpg': '/usr/bin/jpegoptim {filename}'
}

GRAPPELLI_ADMIN_TITLE = 'Flisol 2015'
GRAPPELLI_ADMIN_TITLE = 'FLISoL 2016'

STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
Expand Down
45 changes: 0 additions & 45 deletions manager/initial_data/initial_data.json
Expand Up @@ -78,50 +78,5 @@
"icon_class": "fa-google-plus-square",
"validate": "1"
}
},
{
"model": "manager.Event",
"fields": {
"name": "FLISol-CABA",
"date": "2016-04-25",
"limit_proposal_date": "2016-04-22",
"slug": "caba",
"email": "flisol@gmail.com",
"place": "{}"
},
"pk": 1
},
{
"fields": {
"event": 1,
"name": "Sala Blanca"
},
"model": "manager.Room",
"pk": 1
},
{
"fields": {
"event": 1,
"title": "Linux para tu familia entera",
"long_description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est.",
"abstract": "Vivamus fermentum semper porta. Nunc diam velit, adipiscing ut tristique vitae, sagittis vel odio. Maecenas convallis ullamcorper ultricies.",
"room":1,
"start_date": "2016-04-25T08:30:00",
"end_date": "2016-04-25T09:00:00"
},
"model": "manager.Activity",
"pk":1
},
{
"fields": {
"activity": 1,
"level": 2,
"type":1,
"speakers_names": "Sergio Orbe, Agustín Ignacio Guido Croce Villanustre",
"speakers_email": "reyiyo@gmail.com, agustin.crocevillanustre@gmail.com",
"labels": "Linux, Software Libre, It's Free"
},
"model": "manager.talkproposal",
"pk": 1
}
]
296 changes: 2 additions & 294 deletions wsgi.py

Large diffs are not rendered by default.

Empty file added wsgi/static/.gitkeep
Empty file.

0 comments on commit b5ff060

Please sign in to comment.