External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-17 00:47:29 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #541 from matburt/database_config_source

Browse Source 
Database config source
This commit is contained in:
Matthew Jones
2016-01-12 11:20:43 -05:00
parent fcaf86c1da 272e5829f2
commit 84c2e71907
25 changed files with 1109 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/middleware.py
View File

@@ -11,10 +11,10 @@ from django.db import IntegrityError
from django.http import HttpResponseRedirect
from django.template.response import TemplateResponse
from django.utils.functional import curry
from django.conf import settings
from awx import __version__ as version
from awx.main.models import ActivityStream, Instance
from awx.main.conf import tower_settings
from awx.api.authentication import TokenAuthentication
@@ -117,6 +117,6 @@ class AuthTokenTimeoutMiddleware(object):
if not TokenAuthentication._get_x_auth_token_header(request):
return response
response['Auth-Token-Timeout'] = int(settings.AUTH_TOKEN_EXPIRATION)
response['Auth-Token-Timeout'] = int(tower_settings.AUTH_TOKEN_EXPIRATION)
return response