|
5 | 5 | # for relative imports by default.
|
6 | 6 |
|
7 | 7 | # Celery settings
|
8 |
| - |
9 | 8 | import djcelery
|
10 | 9 | djcelery.setup_loader()
|
11 | 10 |
|
| 11 | +# http://fearofcode.github.io/blog/2013/01/15/how-to-scrub-sensitive-information-from-django-settings-dot-py-files/ |
| 12 | +from proj.settings_secret import * |
| 13 | + |
12 | 14 | # BROKER_URL = 'amqp://guest:guest@localhost//'
|
13 | 15 | BROKER_URL = 'django://'
|
14 | 16 |
|
|
17 | 19 | CELERY_ACCEPT_CONTENT = ['json']
|
18 | 20 | CELERY_TASK_SERIALIZER = 'json'
|
19 | 21 | CELERY_RESULT_SERIALIZER = 'json'
|
| 22 | +CELERY_RESULT_BACKEND='djcelery.backends.database:DatabaseBackend' # http://docs.celeryproject.org/en/master/django/first-steps-with-django.html#using-the-django-orm-cache-as-a-result-backend |
20 | 23 |
|
21 | 24 | # Django settings for proj project.
|
22 | 25 |
|
|
47 | 50 | # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
|
48 | 51 | # although not all choices may be available on all operating systems.
|
49 | 52 | # In a Windows environment this must be set to your system time zone.
|
50 |
| -TIME_ZONE = 'America/Chicago' |
| 53 | +TIME_ZONE = 'US/Eastern' |
51 | 54 |
|
52 | 55 | # Language code for this installation. All choices can be found here:
|
53 | 56 | # http://www.i18nguy.com/unicode/language-identifiers.html
|
|
99 | 102 | 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
|
100 | 103 | )
|
101 | 104 |
|
102 |
| -# Make this unique, and don't share it with anybody. |
103 |
| -SECRET_KEY = 'x2$s&0z2xehpnt_99i8q3)4)t*5q@+n(+6jrqz4@rt%a8fdf+!' |
104 |
| - |
105 | 105 | # List of callables that know how to import templates from various sources.
|
106 | 106 | TEMPLATE_LOADERS = (
|
107 | 107 | 'django.template.loaders.filesystem.Loader',
|
|
114 | 114 | 'django.middleware.csrf.CsrfViewMiddleware',
|
115 | 115 | 'django.contrib.auth.middleware.AuthenticationMiddleware',
|
116 | 116 | 'django.contrib.messages.middleware.MessageMiddleware',
|
117 |
| - # Uncomment the next line for simple clickjacking protection: |
118 |
| - # 'django.middleware.clickjacking.XFrameOptionsMiddleware', |
| 117 | + # simple clickjacking protection: |
| 118 | + 'django.middleware.clickjacking.XFrameOptionsMiddleware', |
119 | 119 | )
|
120 | 120 |
|
121 | 121 | ROOT_URLCONF = 'proj.urls'
|
|
137 | 137 | 'django.contrib.sites',
|
138 | 138 | 'django.contrib.messages',
|
139 | 139 | 'django.contrib.staticfiles',
|
140 |
| - 'django.contrib.admin', |
141 |
| - 'kombu.transport.django', |
142 |
| - # 'kombu.transport.django.KombuAppConfig', |
| 140 | + #'kombu.transport.django', |
| 141 | + 'kombu.transport.django.KombuAppConfig', |
143 | 142 | 'djcelery',
|
144 | 143 | 'demoapp',
|
145 |
| - # Uncomment the next line to enable the admin: |
146 |
| - # 'django.contrib.admin', |
147 |
| - # Uncomment the next line to enable admin documentation: |
148 |
| - # 'django.contrib.admindocs', |
| 144 | + 'django.contrib.admin', # https://docs.djangoproject.com/en/1.8/ref/contrib/admin/ |
| 145 | + # 'django.contrib.admindocs', # https://docs.djangoproject.com/en/1.8/ref/contrib/admin/admindocs/ |
149 | 146 | )
|
150 | 147 |
|
151 | 148 | # A sample logging configuration. The only tangible logging
|
|
0 commit comments