diff --git a/debug.log b/debug.log new file mode 100644 index 0000000..e69de29 diff --git a/packagebuilder/settings.py b/packagebuilder/settings.py index be030ee..3e305e5 100644 --- a/packagebuilder/settings.py +++ b/packagebuilder/settings.py @@ -19,7 +19,7 @@ # See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = os.environ['SECRET_KEY'] +SECRET_KEY = os.environ.get('SECRET_KEY', 'XXX') # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True if os.environ.get('DEBUG') == '1' else False @@ -57,12 +57,6 @@ #'django.middleware.clickjacking.XFrameOptionsMiddleware', ) -# Add in request context processor -from django.conf import global_settings -TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + ( - 'django.core.context_processors.request', -) - ROOT_URLCONF = 'packagebuilder.urls' WSGI_APPLICATION = 'packagebuilder.wsgi.application' @@ -92,9 +86,22 @@ USE_TZ = True -TEMPLATE_DIRS = ( - os.path.join(os.path.dirname(__file__), "templates"), -) +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [os.path.join(BASE_DIR, 'templates')], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + 'debug': DEBUG, + }, + }, +] # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/1.6/howto/static-files/ @@ -109,16 +116,16 @@ STATICFILES_STORAGE = 'whitenoise.django.GzipManifestStaticFilesStorage' -SALESFORCE_CONSUMER_KEY = os.environ['SALESFORCE_CONSUMER_KEY'] -SALESFORCE_CONSUMER_SECRET = os.environ['SALESFORCE_CONSUMER_SECRET'] -SALESFORCE_REDIRECT_URI = os.environ['SALESFORCE_REDIRECT_URI'] -SALESFORCE_API_VERSION = int(os.environ['SALESFORCE_API_VERSION']) +SALESFORCE_CONSUMER_KEY = os.environ.get('SALESFORCE_CONSUMER_KEY') +SALESFORCE_CONSUMER_SECRET = os.environ.get('SALESFORCE_CONSUMER_SECRET') +SALESFORCE_REDIRECT_URI = os.environ.get('SALESFORCE_REDIRECT_URI') +SALESFORCE_API_VERSION = int(os.environ.get('SALESFORCE_API_VERSION', 52)) SALESFORCE_REST_URL = '/services/data/v%d.0/' % SALESFORCE_API_VERSION # Redis settings -redis_url = urlparse.urlparse(os.environ.get('REDIS_URL')) +redis_url = urlparse.urlparse(os.environ.get('REDIS_URL', '')) CACHES = { "default": { "BACKEND": "redis_cache.RedisCache", diff --git a/packagebuilder/urls.py b/packagebuilder/urls.py index cc3eb44..b6ab814 100644 --- a/packagebuilder/urls.py +++ b/packagebuilder/urls.py @@ -1,23 +1,21 @@ -from django.conf.urls import patterns, include, url -from django.views.generic import TemplateView +from django.conf.urls import url, include from django.contrib import admin -from django.conf import settings from buildpackage import views admin.autodiscover() -urlpatterns = patterns('', - url(r'^$', 'buildpackage.views.index', name='index'), +urlpatterns = [ + url(r'^$', views.index, name='index'), url(r'^admin/', include(admin.site.urls)), - url(r'^oauth_response/$', 'buildpackage.views.oauth_response'), - url(r'^package/(?P[0-9A-Za-z_\-]+)/$', 'buildpackage.views.package'), - url(r'^logout/$', 'buildpackage.views.logout'), - url(r'^job_status/(?P[0-9A-Za-z_\-]+)/$', 'buildpackage.views.job_status'), - url(r'^loading/(?P[0-9A-Za-z_\-]+)/$', 'buildpackage.views.loading'), - url(r'^auth_details/$', 'buildpackage.views.auth_details'), + url(r'^oauth_response/$', views.oauth_response), + url(r'^package/(?P[0-9A-Za-z_\-]+)/$', views.package), + url(r'^logout/$', views.logout), + url(r'^job_status/(?P[0-9A-Za-z_\-]+)/$', views.job_status), + url(r'^loading/(?P[0-9A-Za-z_\-]+)/$', views.loading), + url(r'^auth_details/$', views.auth_details), - url(r'^api/package/$', 'buildpackage.views.api_create_job'), - url(r'^api/package/status/(?P[0-9A-Za-z_\-]+)/$', 'buildpackage.views.job_status'), - url(r'^api/package/(?P[-\w]+)$', 'buildpackage.views.get_package'), -) + url(r'^api/package/$', views.api_create_job), + url(r'^api/package/status/(?P[0-9A-Za-z_\-]+)/$', views.job_status), + url(r'^api/package/(?P[-\w]+)$', views.get_package), +] diff --git a/requirements.txt b/requirements.txt index 63b58ed..d8aaea8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,17 +1,21 @@ -Django==1.6.5 +amqp==1.4.9 +anyjson==0.3.3 +billiard==3.3.0.23 +celery==3.1.0 dj-database-url==0.3.0 dj-static==0.0.5 +Django==1.11.17 django-redis-cache==1.6.0 django-toolbelt==0.0.1 -gunicorn==18.0 +django-widget-tweaks==1.4.1 +gunicorn==19.5.0 +kombu==3.0.37 lxml==3.3.5 psycopg2==2.7.3.2 pystache==0.5.4 +pytz==2021.1 +redis==2.10.3 requests==2.3.0 static==1.0.2 suds==0.4 -wsgiref==0.1.2 -celery==3.1.0 -redis==2.10.3 whitenoise==1.0.3 -django-widget-tweaks==1.4.1 \ No newline at end of file