vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1583 from coreos-inc/setup-fixes

Browse source 
Setup bug fixes
This commit is contained in:
josephschorr 2016-06-27 13:46:46 -04:00 committed by GitHub
commit 00aa27beb9
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
static/js/pages/setup.js
View file

@ -141,7 +141,14 @@
$scope.showSuperuserPanel = function() {
$('#setupModal').modal('hide');
var prefix = $scope.hasSSL ? 'https' : 'http';
var hostname = $scope.hostname || document.location.hostname;
var hostname = $scope.hostname;
if (!hostname) {
hostname = document.location.hostname;
if (document.location.port) {
hostname = hostname + ':' + document.location.port;
}
}
window.location = prefix + '://' + hostname + '/superuser';
};

2
util/config/oauth.py
View file

@ -265,7 +265,7 @@ class OIDCConfig(OAuthConfig):
self._http_client = config['HTTPCLIENT']
if self.config.get('OIDC_SERVER'):
self._load_via_discovery(config['DEBUGGING'])
self._load_via_discovery(config.get('DEBUGGING', False))
def _load_via_discovery(self, is_debugging):
oidc_server = self.config['OIDC_SERVER']