jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Use toplevel cert renewal api for all domains

Browse Source
This commit is contained in:
Johannes Zellner
2018-12-11 12:41:42 +01:00
parent 5cd696792b
commit 1670f15732
3 changed files with 56 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/views/domains.html
View File

@@ -199,19 +199,19 @@
</div>
<!-- Modal renew certs -->
<div class="modal fade" id="domainRenewCertsModal" tabindex="-1" role="dialog">
<div class="modal fade" id="renewCertsModal" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Renew certs of {{ domainRenewCerts.domain.domain }} ?</h4>
<h4 class="modal-title">Renew certs for all domains?</h4>
</div>
<div class="modal-body">
<p>This will renew certs of apps installed under this domain. Only certs that are expiring in next 30 days will be renewed. It can take ~5 minutes to renew and install the certificates. Check the <a href="/#/activity">activity log</a> for renewal status. </p>
<p>This will renew certs of all apps installed. Only certs that are expiring in next 30 days will be renewed. It can take ~5 minutes to renew and install the certificates. Check the <a href="/#/activity">activity log</a> for renewal status. </p>
<br/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-success" ng-click="domainRenewCerts.submit()" ng-disabled="domainRenewCerts.busy"><i class="fa fa-circle-notch fa-spin" ng-show="domainRenewCerts.busy"></i> Renew Certs</button>
<button type="button" class="btn btn-success" ng-click="renewCerts.submit()" ng-disabled="renewCerts.busy"><i class="fa fa-circle-notch fa-spin" ng-show="renewCerts.busy"></i> Renew Certs</button>
</div>
</div>
</div>
@@ -254,44 +254,46 @@
</div>
<div class="card card-large">
<div class="grid-item-top">
<div class="row ng-hide" ng-show="!ready">
<div class="col-lg-12 text-center">
<h2><i class="fa fa-circle-notch fa-spin"></i></h2>
</div>
<div class="row ng-hide" ng-show="!ready">
<div class="col-lg-12 text-center">
<h2><i class="fa fa-circle-notch fa-spin"></i></h2>
</div>
<div class="row animateMeOpacity ng-hide" ng-show="ready">
<div class="col-lg-12">
<table class="table table-hover">
<thead>
<tr>
<th style="width: 10px"></th>
<th>Domain</th>
<th class="text-left hidden-xs hidden-sm">Provider</th>
<th style="width: 100px" class="text-right">Actions</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="domain in domains">
<td>
<i class="fa fa-lock" ng-show="domain.locked" uib-tooltip="This domain is locked and cannot be edited"></i>
</td>
<td class="elide-table-cell hand" ng-click="domain.provider !== 'caas' && !domain.locked && domainConfigure.show(domain)">
{{ domain.domain }}
</td>
<td class="text-left elide-table-cell hidden-xs hidden-sm hand" ng-click="domain.provider !== 'caas' && !domain.locked && domainConfigure.show(domain)">
{{ prettyProviderName(domain) }}
</td>
<td class="text-right no-wrap" style="vertical-align: bottom">
<button class="btn btn-xs btn-default" ng-click="domainMigrate.show(domain)" ng-show="domain.domain !== config.adminDomain && domain.provider !== 'caas' && provider === 'caas'" title="Migrate Domain"><i class="fa fa-exchange"></i></button>
<button class="btn btn-xs btn-default" ng-click="domainRenewCerts.show(domain)" ng-show="domain.provider !== 'caas' && !domain.locked" title="Renew Certs"><i class="fa fa-certificate"></i></button>
<button class="btn btn-xs btn-default" ng-click="domainConfigure.show(domain)" ng-show="domain.provider !== 'caas' && !domain.locked" title="Edit Domain"><i class="fa fa-pencil-alt"></i></button>
<button class="btn btn-xs btn-danger" ng-click="domainRemove.show(domain)" ng-show="domain.provider !== 'caas' && !domain.locked" title="Remove Domain"><i class="far fa-trash-alt"></i></button>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="row animateMeOpacity ng-hide" ng-show="ready">
<div class="col-lg-12">
<table class="table table-hover" style="margin-top: 10px;">
<thead>
<tr>
<th style="width: 10px"></th>
<th>Domain</th>
<th class="text-left hidden-xs hidden-sm">Provider</th>
<th style="width: 100px" class="text-right">Actions</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="domain in domains">
<td>
<i class="fa fa-lock" ng-show="domain.locked" uib-tooltip="This domain is locked and cannot be edited"></i>
</td>
<td class="elide-table-cell hand" ng-click="domain.provider !== 'caas' && !domain.locked && domainConfigure.show(domain)">
{{ domain.domain }}
</td>
<td class="text-left elide-table-cell hidden-xs hidden-sm hand" ng-click="domain.provider !== 'caas' && !domain.locked && domainConfigure.show(domain)">
{{ prettyProviderName(domain) }}
</td>
<td class="text-right no-wrap" style="vertical-align: bottom">
<button class="btn btn-xs btn-default" ng-click="domainMigrate.show(domain)" ng-show="domain.domain !== config.adminDomain && domain.provider !== 'caas' && provider === 'caas'" title="Migrate Domain"><i class="fa fa-exchange"></i></button>
<button class="btn btn-xs btn-default" ng-click="domainConfigure.show(domain)" ng-show="domain.provider !== 'caas' && !domain.locked" title="Edit Domain"><i class="fa fa-pencil-alt"></i></button>
<button class="btn btn-xs btn-danger" ng-click="domainRemove.show(domain)" ng-show="domain.provider !== 'caas' && !domain.locked" title="Remove Domain"><i class="far fa-trash-alt"></i></button>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="row animateMeOpacity ng-hide" ng-show="ready && domain.provider !== 'caas'">
<div class="col-lg-12">
<button class="btn btn-primary pull-right" ng-click="renewCerts.show()" title="Renew Certs for all Domains">Renew Certs</button>
</div>
</div>
</div>