Skip to content

Commit

Permalink
Display a notice about Cockpit certificate reload
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidePrincipi committed Dec 6, 2019
1 parent ee375e7 commit 94eba42
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
2 changes: 2 additions & 0 deletions ui/public/i18n/language.json
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,8 @@
"add_domain": "Add domain",
"renew_days": "Renew days",
"request": "Request",
"cockpit_reload_warning_title": "Notice.",
"cockpit_reload_warning_message": "The new certificate is applied to the Cockpit Server Manager 90 seconds after the last user is disconnected.",
"view_certificate": "View certificate",
"alternative_name": "Comma-separated list of FQDNs",
"cert_default_ok": "Certificate set as default successfully!",
Expand Down
15 changes: 15 additions & 0 deletions ui/src/components/system/Certificates.vue
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,11 @@
</div>
<form class="form-horizontal" v-on:submit.prevent="uploadCertificate(newCertificate)">
<div class="modal-body">
<div class="alert alert-info">
<span class="pficon pficon-info"></span>
<strong>{{ $t('certificates.cockpit_reload_warning_title') }}</strong>&#x20;{{ $t('certificates.cockpit_reload_warning_message') }}
</div>

<div v-if="newCertificate.errorMessage" class="alert alert-danger alert-dismissable">
<span class="pficon pficon-error-circle-o"></span>
<strong>{{$t('certificates.error')}}.</strong>
Expand Down Expand Up @@ -242,6 +247,11 @@
v-on:submit.prevent="editCertificate(selfSignedCertificate)"
>
<div class="modal-body">
<div class="alert alert-info">
<span class="pficon pficon-info"></span>
<strong>{{ $t('certificates.cockpit_reload_warning_title') }}</strong>&#x20;{{ $t('certificates.cockpit_reload_warning_message') }}
</div>

<div
:class="['form-group', selfSignedCertificate.errors.CountryCode.hasError ? 'has-error' : '']"
>
Expand Down Expand Up @@ -452,6 +462,11 @@
v-on:submit.prevent="requestLetsEncrypt(letsEncryptCertificate)"
>
<div class="modal-body">
<div class="alert alert-info">
<span class="pficon pficon-info"></span>
<strong>{{ $t('certificates.cockpit_reload_warning_title') }}</strong>&#x20;{{ $t('certificates.cockpit_reload_warning_message') }}
</div>

<div
v-if="letsEncryptCertificate.errorMessage"
class="alert alert-danger alert-dismissable"
Expand Down

0 comments on commit 94eba42

Please sign in to comment.