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

when a license is installed, only set TOWER_URL_BASE if necessary

Browse Source 
it's possible for users to set this manually in /etc/tower/conf.d
prior to license application
This commit is contained in:
Ryan Petrello
2020-01-30 16:14:36 -05:00
parent d6c70e8d3a
commit c7c899375b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/views/root.py
View File

@@ -20,6 +20,7 @@ from rest_framework import status
import requests import requests
from awx.api.generics import APIView from awx.api.generics import APIView
from awx.conf.registry import settings_registry
from awx.main.ha import is_ha_environment from awx.main.ha import is_ha_environment
from awx.main.utils import ( from awx.main.utils import (
get_awx_version, get_awx_version,
@@ -302,7 +303,8 @@ class ApiV2ConfigView(APIView):
# If the license is valid, write it to the database. # If the license is valid, write it to the database.
if license_data_validated['valid_key']: if license_data_validated['valid_key']:
settings.LICENSE = license_data settings.LICENSE = license_data
settings.TOWER_URL_BASE = "{}://{}".format(request.scheme, request.get_host()) if not settings_registry.is_setting_read_only('TOWER_URL_BASE'):
settings.TOWER_URL_BASE = "{}://{}".format(request.scheme, request.get_host())
return Response(license_data_validated) return Response(license_data_validated)
logger.warning(smart_text(u"Invalid license submitted."), logger.warning(smart_text(u"Invalid license submitted."),