isLetsEncrypt() -> isCertLetsEncrypt(), isCustomCert() -> isCertCustom()

This commit is contained in:
Szekeres Bálint
2018-03-10 12:42:05 +01:00
parent 9ab32cc1f7
commit 3396047a5c
5 changed files with 50 additions and 44 deletions

View File

@@ -137,6 +137,12 @@ main .options .card .form-subgroup {
padding-left: 0.5rem;
}
main .options .card .form-subgroup .form-subgroup {
margin-left: 0;
border-left: 1px solid #d7e0ea;
padding-left: 0.4rem;
}
main .options .card .form-control[type="text"]:placeholder-shown,
main .options .card .form-control[type="email"]:placeholder-shown {
background-color: #f8f8f8;

View File

@@ -112,7 +112,7 @@
};
$scope.sslCertificate = function() {
if ($scope.isLetsEncrypt()) {
if ($scope.isCertLetsEncrypt()) {
return '/etc/letsencrypt/live/' + $scope.domain() + '/fullchain.pem'
}
@@ -124,7 +124,7 @@
};
$scope.sslCertificateKey = function() {
if ($scope.isLetsEncrypt()) {
if ($scope.isCertLetsEncrypt()) {
return '/etc/letsencrypt/live/' + $scope.domain() + '/privkey.pem'
}
@@ -285,11 +285,11 @@
return $scope.isHTTPS() && $scope.data.force_https;
};
$scope.isLetsEncrypt = function() {
$scope.isCertLetsEncrypt = function() {
return $scope.isHTTPS() && $scope.data.cert_type === 'letsencrypt';
};
$scope.isCustomCert = function() {
$scope.isCertCustom = function() {
return $scope.isHTTPS() && $scope.data.cert_type === 'custom';
};