Gogs 7 роки тому
батько
коміт
b651847c31
3 змінених файлів з 22 додано та 9 видалено
  1. 6 0
      .env
  2. 11 9
      odoo_control/settings.py
  3. 5 0
      requirements.txt

+ 6 - 0
.env

@@ -0,0 +1,6 @@
+SECRET_KEY = '^*&s%i#9p7tq(#%f)--#ki2*qx8=iv5173eg35$qupv8%+fyv7'
+DEBUG = True
+JWT_ACCEPT_HEADER = 'HTTP_AUTHORIZATION'
+JWT_PREFIX_HEADER = 'JWT'
+JWT_SECRET_KEY = '123456789'
+PLAYBOOKS_PATH = '/home/robert/workspace/playbooks'

+ 11 - 9
odoo_control/settings.py

@@ -1,11 +1,10 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+from decouple import config
 import os
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-SECRET_KEY = '^*&s%i#9p7tq(#%f)--#ki2*qx8=iv5173eg35$qupv8%+fyv7'
-
-DEBUG = True
-
 ALLOWED_HOSTS = ['*']
 
 INSTALLED_APPS = [
@@ -15,7 +14,6 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'django_extensions',
     'tastypie',
     'core.apps.CoreConfig',
     'api.apps.ApiConfig',
@@ -90,10 +88,14 @@ STATIC_URL = '/static/'
 
 TASTYPIE_DEFAULT_FORMATS = ['json', 'xml']
 
-JWT_ACCEPT_HEADER = 'Authorization'
+SECRET_KEY = config('SECRET_KEY')
+
+DEBUG = config('DEBUG', default=False, cast=bool)
+
+JWT_ACCEPT_HEADER = config('JWT_ACCEPT_HEADER')
 
-JWT_PREFIX_HEADER = 'JWT'
+JWT_PREFIX_HEADER = config('JWT_PREFIX_HEADER')
 
-JWT_SECRET_KEY = '123456789'
+JWT_SECRET_KEY = config('JWT_SECRET_KEY')
 
-PLAYBOOKS_PATH = '/home/robert/workspace/playbooks'
+PLAYBOOKS_PATH = config('PLAYBOOKS_PATH')

+ 5 - 0
requirements.txt

@@ -5,6 +5,7 @@ certifi==2018.1.18
 chardet==3.0.4
 configparser==3.5.0
 Django==1.11
+django-extensions==2.0.0
 django-tastypie==0.14.0
 docker==3.0.1
 docker-pycreds==0.2.1
@@ -19,11 +20,15 @@ pkg-resources==0.0.0
 PyJWT==1.5.3
 pylint==1.8.2
 python-dateutil==2.6.1
+python-decouple==3.1
 python-mimeparse==1.6.0
 pytz==2018.3
 requests==2.18.4
+simplejson==3.13.2
 singledispatch==3.4.0.3
 six==1.11.0
+typing==3.6.4
 urllib3==1.22
 websocket-client==0.46.0
+Werkzeug==0.14.1
 wrapt==1.10.11