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

Merge remote-tracking branch 'tower/release_3.3.0' into devel

Browse Source
This commit is contained in:
Ryan Petrello
2018-08-10 11:54:34 -04:00
parent a34d8eba06 c85dd25135
commit 18f6f68540
701 changed files with 44895 additions and 33927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/settings/development.py
View File

@@ -159,7 +159,9 @@ SERVICE_NAME_DICT = {
"nginx": "nginx"}
try:
socket.gethostbyname('docker.for.mac.internal')
os.environ['SDB_NOTIFY_HOST'] = 'docker.for.mac.internal'
socket.gethostbyname('docker.for.mac.host.internal')
os.environ['SDB_NOTIFY_HOST'] = 'docker.for.mac.host.internal'
except Exception:
os.environ['SDB_NOTIFY_HOST'] = os.popen('ip route').read().split(' ')[2]
WEBSOCKET_ORIGIN_WHITELIST = ['https://localhost:8043', 'https://localhost:3000']