Get mapped fields (Github and Redis) working
This commit is contained in:
Joseph Schorr
parent
219730c341
commit
32c0a14d96
4 changed files with 117 additions and 35 deletions
|
|
@ -1,6 +1,6 @@
|
|||
<div class="config-setup-tool-element">
|
||||
<div class="quay-spinner" ng-if="!config"></div>
|
||||
<div ng-if="config">
|
||||
<div ng-show="config && config['SERVER_HOSTNAME']">
|
||||
<!-- Basic Configuration -->
|
||||
<div class="co-panel">
|
||||
<div class="co-panel-heading">
|
||||
|
|
@ -12,13 +12,13 @@
|
|||
<td>Enterprise Logo URL:</td>
|
||||
<td>
|
||||
<span class="config-string-field" binding="config.ENTERPRISE_LOGO_URL"
|
||||
placeholder="URL of a logo to use for your enterprise"></span>
|
||||
placeholder="http://example.com/logo.png"></span>
|
||||
<div class="help-text">
|
||||
This is optional. If not specified, the default logo will be used.
|
||||
Enter the full URL to your company's logo.
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<img ng-src="{{ config.ENTERPRISE_LOGO_URL }}">
|
||||
<img class="registry-logo-preview" ng-src="{{ config.ENTERPRISE_LOGO_URL }}">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -44,13 +44,14 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>User Creation:</td>
|
||||
<td>
|
||||
<td colspan="2">
|
||||
<div class="co-checkbox">
|
||||
<input id="ftuc" type="checkbox" ng-model="config.FEATURE_USER_CREATION">
|
||||
<label for="ftuc">Enable User Creation</label>
|
||||
<label for="ftuc">Enable Open User Creation</label>
|
||||
</div>
|
||||
<div class="help-text">
|
||||
If enabled, users can be created from the registry UI.
|
||||
If enabled, user accounts can be created by anyone.
|
||||
Users can always be created in the users panel under this superuser view.
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -83,7 +84,7 @@
|
|||
<div class="co-panel-body">
|
||||
<table class="config-table">
|
||||
<tr>
|
||||
<td>Server hostname:</td>
|
||||
<td>Server Hostname:</td>
|
||||
<td>
|
||||
<span class="config-string-field" binding="config.SERVER_HOSTNAME"
|
||||
placeholder="Hostname (and optional port if non-standard)"></span>
|
||||
|
|
@ -141,9 +142,9 @@
|
|||
|
||||
<table class="config-table">
|
||||
<tr>
|
||||
<td>Redis hostname:</td>
|
||||
<td>Redis Hostname:</td>
|
||||
<td>
|
||||
<span class="config-string-field" binding="mapped.redis.hostname"
|
||||
<span class="config-string-field" binding="mapped.redis.host"
|
||||
placeholder="The redis server hostname"></span>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -160,8 +161,8 @@
|
|||
<tr>
|
||||
<td>Redis password:</td>
|
||||
<td>
|
||||
<span class="config-string-field" binding="mapped.redis.password"
|
||||
placeholder="Optional password for connecting to redis"></span>
|
||||
<input class="form-control" type="password" ng-model="mapped.redis.password"
|
||||
placeholder="Optional password for connecting to redis">
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
@ -489,24 +490,22 @@
|
|||
|
||||
<table class="config-table" ng-show="config.FEATURE_GITHUB_LOGIN">
|
||||
<tr>
|
||||
<td>Github Endpoint:</td>
|
||||
<td>Github:</td>
|
||||
<td>
|
||||
<span class="config-string-field" binding="config.GITHUB_LOGIN_CONFIG.GITHUB_ENDPOINT"
|
||||
placeholder="The Github server">
|
||||
</span>
|
||||
<div class="help-text">
|
||||
https://github.com/ for github.com. For Github enterprise, the internal Github endpoint.
|
||||
</div>
|
||||
<select ng-model="mapped.GITHUB_LOGIN_KIND">
|
||||
<option value="hosted">Github.com</option>
|
||||
<option value="enterprise">Github Enterprise</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>API Endpoint:</td>
|
||||
<tr ng-show="mapped.GITHUB_LOGIN_KIND == 'enterprise'">
|
||||
<td>Github Endpoint:</td>
|
||||
<td>
|
||||
<span class="config-string-field" binding="config.GITHUB_LOGIN_CONFIG.API_ENDPOINT"
|
||||
placeholder="API server endpoint">
|
||||
placeholder="https://my.githubserver">
|
||||
</span>
|
||||
<div class="help-text">
|
||||
https://api.github.com/ for github.com. For Github Enterprise, leave empty.
|
||||
The Github Enterprise endpoint.
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -609,24 +608,22 @@
|
|||
|
||||
<table class="config-table" ng-show="config.FEATURE_GITHUB_BUILD">
|
||||
<tr>
|
||||
<td>Github Endpoint:</td>
|
||||
<td>Github:</td>
|
||||
<td>
|
||||
<span class="config-string-field" binding="config.GITHUB_TRIGGER_CONFIG.GITHUB_ENDPOINT"
|
||||
placeholder="The Github server">
|
||||
</span>
|
||||
<div class="help-text">
|
||||
https://github.com/ for github.com. For Github enterprise, the internal Github endpoint.
|
||||
</div>
|
||||
<select ng-model="mapped.GITHUB_TRIGGER_KIND">
|
||||
<option value="hosted">Github.com</option>
|
||||
<option value="enterprise">Github Enterprise</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>API Endpoint:</td>
|
||||
<tr ng-show="mapped.GITHUB_TRIGGER_KIND == 'enterprise'">
|
||||
<td>Github Endpoint:</td>
|
||||
<td>
|
||||
<span class="config-string-field" binding="config.GITHUB_TRIGGER_CONFIG.API_ENDPOINT"
|
||||
placeholder="API server endpoint">
|
||||
placeholder="https://my.githubserver">
|
||||
</span>
|
||||
<div class="help-text">
|
||||
https://api.github.com/ for github.com. For Github Enterprise, leave empty.
|
||||
The Github Enterprise endpoint.
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
|||
Reference in a new issue