mirror of
https://github.com/bunkerity/bunkerweb
synced 2026-05-24 09:28:37 +00:00
ui - enhance setup configuration for Let's Encrypt options
This commit is contained in:
Théophile Diot
parent
52a3814728
commit
bae9cb13d9
3 changed files with 321 additions and 6 deletions
|
|
@ -31,6 +31,10 @@ def setup_page():
|
|||
"AUTO_LETS_ENCRYPT",
|
||||
"USE_LETS_ENCRYPT_STAGING",
|
||||
"EMAIL_LETS_ENCRYPT",
|
||||
"LETS_ENCRYPT_CHALLENGE",
|
||||
"LETS_ENCRYPT_DNS_PROVIDER",
|
||||
"LETS_ENCRYPT_DNS_PROPAGATION",
|
||||
"USE_LETS_ENCRYPT_WILDCARD",
|
||||
"USE_CUSTOM_SSL",
|
||||
"CUSTOM_SSL_CERT",
|
||||
"CUSTOM_SSL_KEY",
|
||||
|
|
@ -60,7 +64,12 @@ def setup_page():
|
|||
"ui_url",
|
||||
"auto_lets_encrypt",
|
||||
"lets_encrypt_staging",
|
||||
"lets_encrypt_wildcard",
|
||||
"email_lets_encrypt",
|
||||
"lets_encrypt_challenge",
|
||||
"lets_encrypt_dns_provider",
|
||||
"lets_encrypt_dns_propagation",
|
||||
"lets_encrypt_dns_credential_items",
|
||||
"use_custom_ssl",
|
||||
"custom_ssl_cert",
|
||||
"custom_ssl_key",
|
||||
|
|
@ -138,12 +147,25 @@ def setup_page():
|
|||
"USE_REVERSE_PROXY": "yes",
|
||||
"REVERSE_PROXY_HOST": request.form["ui_host"],
|
||||
"REVERSE_PROXY_URL": request.form["ui_url"] or "/",
|
||||
"USE_LETS_ENCRYPT_STAGING": request.form["lets_encrypt_staging"],
|
||||
"EMAIL_LETS_ENCRYPT": request.form["email_lets_encrypt"],
|
||||
}
|
||||
|
||||
if request.form.get("auto_lets_encrypt", "no") == "yes":
|
||||
config["AUTO_LETS_ENCRYPT"] = "yes"
|
||||
config.update(
|
||||
{
|
||||
"AUTO_LETS_ENCRYPT": "yes",
|
||||
"USE_LETS_ENCRYPT_STAGING": request.form["lets_encrypt_staging"],
|
||||
"USE_LETS_ENCRYPT_WILDCARD": request.form["lets_encrypt_wildcard"],
|
||||
"EMAIL_LETS_ENCRYPT": request.form["email_lets_encrypt"],
|
||||
"LETS_ENCRYPT_CHALLENGE": request.form["lets_encrypt_challenge"],
|
||||
"LETS_ENCRYPT_DNS_PROVIDER": request.form["lets_encrypt_dns_provider"],
|
||||
"LETS_ENCRYPT_DNS_PROPAGATION": request.form["lets_encrypt_dns_propagation"],
|
||||
}
|
||||
)
|
||||
|
||||
lets_encrypt_dns_credential_items = request.form.getlist("lets_encrypt_dns_credential_items")
|
||||
for x in range(len(lets_encrypt_dns_credential_items)):
|
||||
if lets_encrypt_dns_credential_items[x]:
|
||||
config["LETS_ENCRYPT_DNS_CREDENTIAL_ITEM" + (f"_{x}" if x else "")] = lets_encrypt_dns_credential_items[x]
|
||||
elif request.form.get("use_custom_ssl", "no") == "yes":
|
||||
if not all(
|
||||
[
|
||||
|
|
@ -198,7 +220,11 @@ def setup_page():
|
|||
ui_host=db_config.get("UI_HOST", getenv("UI_HOST", "")),
|
||||
auto_lets_encrypt=db_config.get("AUTO_LETS_ENCRYPT", getenv("AUTO_LETS_ENCRYPT", "no")),
|
||||
lets_encrypt_staging=db_config.get("USE_LETS_ENCRYPT_STAGING", getenv("USE_LETS_ENCRYPT_STAGING", "no")),
|
||||
lets_encrypt_wildcard=db_config.get("USE_LETS_ENCRYPT_WILDCARD", getenv("USE_LETS_ENCRYPT_WILDCARD", "no")),
|
||||
email_lets_encrypt=db_config.get("EMAIL_LETS_ENCRYPT", getenv("EMAIL_LETS_ENCRYPT", "")),
|
||||
lets_encrypt_challenge=db_config.get("LETS_ENCRYPT_CHALLENGE", getenv("LETS_ENCRYPT_CHALLENGE", "http")),
|
||||
lets_encrypt_dns_provider=db_config.get("LETS_ENCRYPT_DNS_PROVIDER", getenv("LETS_ENCRYPT_DNS_PROVIDER", "")),
|
||||
lets_encrypt_dns_propagation=db_config.get("LETS_ENCRYPT_DNS_PROPAGATION", getenv("LETS_ENCRYPT_DNS_PROPAGATION", "default")),
|
||||
use_custom_ssl=db_config.get("USE_CUSTOM_SSL", getenv("USE_CUSTOM_SSL", "no")),
|
||||
custom_ssl_cert=db_config.get("CUSTOM_SSL_CERT", getenv("CUSTOM_SSL_CERT", "")),
|
||||
custom_ssl_key=db_config.get("CUSTOM_SSL_KEY", getenv("CUSTOM_SSL_KEY", "")),
|
||||
|
|
|
|||
|
|
@ -404,6 +404,57 @@ $(document).ready(() => {
|
|||
$confirmPasswordInput.siblings(".invalid-feedback").text("");
|
||||
}
|
||||
} else if (!uiReverseProxy && currentStep === 2) {
|
||||
const autoLetsEncrypt = $("#AUTO_LETS_ENCRYPT").prop("checked");
|
||||
const letsEncryptChallenge = $("#LETS_ENCRYPT_CHALLENGE")
|
||||
.find(":selected")
|
||||
.val();
|
||||
if (autoLetsEncrypt && letsEncryptChallenge === "dns") {
|
||||
const $letsEncryptProvider = $("#LETS_ENCRYPT_DNS_PROVIDER");
|
||||
if (!$letsEncryptProvider.find(":selected").val()) {
|
||||
$letsEncryptProvider.addClass("is-invalid");
|
||||
let $feedback = $letsEncryptProvider.siblings(".invalid-feedback");
|
||||
if (!$feedback.length) {
|
||||
const $textSpan = $letsEncryptProvider
|
||||
.parent()
|
||||
.find("span.input-group-text");
|
||||
$feedback = $(
|
||||
'<div class="invalid-feedback">This field is required when using DNS challenge.</div>',
|
||||
).insertAfter(
|
||||
$textSpan.length ? $textSpan : $letsEncryptProvider,
|
||||
);
|
||||
} else {
|
||||
$feedback.text(
|
||||
"This field is required when using DNS challenge.",
|
||||
);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
const $letsEncryptCredentialItems = $(
|
||||
"#LETS_ENCRYPT_DNS_CREDENTIAL_ITEMS",
|
||||
);
|
||||
if (!$letsEncryptCredentialItems.val()) {
|
||||
$letsEncryptCredentialItems.addClass("is-invalid");
|
||||
let $feedback =
|
||||
$letsEncryptCredentialItems.siblings(".invalid-feedback");
|
||||
if (!$feedback.length) {
|
||||
const $textSpan = $letsEncryptCredentialItems
|
||||
.parent()
|
||||
.find("span.input-group-text");
|
||||
$feedback = $(
|
||||
'<div class="invalid-feedback">This field is required when using DNS challenge.</div>',
|
||||
).insertAfter(
|
||||
$textSpan.length ? $textSpan : $letsEncryptCredentialItems,
|
||||
);
|
||||
} else {
|
||||
$feedback.text(
|
||||
"This field is required when using DNS challenge.",
|
||||
);
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
const $customSslCert = $("#CUSTOM_SSL_CERT");
|
||||
const $customSslKey = $("#CUSTOM_SSL_KEY");
|
||||
if (
|
||||
|
|
@ -545,7 +596,31 @@ $(document).ready(() => {
|
|||
"lets_encrypt_staging",
|
||||
$("#LETS_ENCRYPT_STAGING").prop("checked") ? "yes" : "no",
|
||||
);
|
||||
formData.append(
|
||||
"lets_encrypt_wildcard",
|
||||
$("#USE_LETS_ENCRYPT_WILDCARD").prop("checked") ? "yes" : "no",
|
||||
);
|
||||
formData.append("email_lets_encrypt", $("#EMAIL_LETS_ENCRYPT").val());
|
||||
formData.append(
|
||||
"lets_encrypt_challenge",
|
||||
$("#LETS_ENCRYPT_CHALLENGE").find(":selected").val(),
|
||||
);
|
||||
formData.append(
|
||||
"lets_encrypt_dns_provider",
|
||||
$("#LETS_ENCRYPT_DNS_PROVIDER").find(":selected").val(),
|
||||
);
|
||||
formData.append(
|
||||
"lets_encrypt_dns_propagation",
|
||||
$("#LETS_ENCRYPT_DNS_PROPAGATION").val(),
|
||||
);
|
||||
formData.append(
|
||||
"lets_encrypt_dns_credential_items",
|
||||
$("#LETS_ENCRYPT_DNS_CREDENTIAL_ITEMS")
|
||||
.val()
|
||||
.split("\n")
|
||||
.map((item) => item.trim())
|
||||
.filter((item) => item !== ""),
|
||||
);
|
||||
formData.append(
|
||||
"use_custom_ssl",
|
||||
$("#USE_CUSTOM_SSL").prop("checked") ? "yes" : "no",
|
||||
|
|
@ -610,6 +685,7 @@ $(document).ready(() => {
|
|||
|
||||
$(document).on("keydown", ".plugin-setting", function (e) {
|
||||
if (e.key === "Enter" || e.keyCode === 13) {
|
||||
if ($("#LETS_ENCRYPT_DNS_CREDENTIAL_ITEMS").is(":focus")) return;
|
||||
$("#next-step").trigger("click");
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
value="{{ csrf_token() }}" />
|
||||
<input type="hidden" name="theme" value="light" />
|
||||
<div class="container-xxl">
|
||||
<div class="position-fixed top-0 end-0 m-5">
|
||||
<div class="position-fixed top-0 end-0 m-5" style="z-index: 1050;">
|
||||
<!-- prettier-ignore -->
|
||||
<div class="d-flex justify-content-end align-items-center mb-5">
|
||||
<div class="toggle-container d-flex align-items-center bg-white p-2 rounded-pill shadow-lg me-3">
|
||||
|
|
@ -391,7 +391,7 @@
|
|||
pattern="^.*$" />
|
||||
</div>
|
||||
<h6 class="mt-2 mb-2 fw-bold">Let's Encrypt</h6>
|
||||
<div class="col-6 col-md-3 pb-3">
|
||||
<div class="col-4 pb-3">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
<label id="label-AUTO_LETS_ENCRYPT"
|
||||
for="AUTO_LETS_ENCRYPT"
|
||||
|
|
@ -425,7 +425,7 @@
|
|||
{% if auto_lets_encrypt == "yes" %}checked{% endif %} />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6 col-md-3 pb-3">
|
||||
<div class="col-4 pb-3">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
<label id="label-USE_LETS_ENCRYPT_STAGING"
|
||||
for="USE_LETS_ENCRYPT_STAGING"
|
||||
|
|
@ -459,6 +459,40 @@
|
|||
{% if lets_encrypt_staging == "yes" %}checked{% endif %} />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-4 pb-3">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
<label id="label-USE_LETS_ENCRYPT_WILDCARD"
|
||||
for="USE_LETS_ENCRYPT_WILDCARD"
|
||||
class="form-label fw-semibold text-truncate">
|
||||
Wildcard Certificates
|
||||
</label>
|
||||
<div class="d-flex align-items-center">
|
||||
{% if lets_encrypt_wildcard == "yes" %}
|
||||
<span class="badge badge-center rounded-pill bg-primary-subtle text-dark d-flex align-items-center justify-content-center p-1 me-1"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-placement="top"
|
||||
data-bs-original-title="From global configuration">
|
||||
<span class="bx bx-globe bx-xs"></span>
|
||||
</span>
|
||||
{% endif %}
|
||||
<span class="badge rounded-pill bg-secondary-subtle text-dark d-flex align-items-center justify-content-center p-1"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-placement="top"
|
||||
data-bs-original-title="Create wildcard certificates for all domains. This allows a single certificate to secure multiple subdomains.">
|
||||
<span class="bx bx-question-mark bx-xs"></span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-check form-switch mt-1">
|
||||
<input id="USE_LETS_ENCRYPT_WILDCARD"
|
||||
name="USE_LETS_ENCRYPT_WILDCARD"
|
||||
class="form-check-input"
|
||||
type="checkbox"
|
||||
role="switch"
|
||||
aria-labelledby="label-USE_LETS_ENCRYPT_WILDCARD"
|
||||
{% if lets_encrypt_wildcard == "yes" %}checked{% endif %} />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 pb-3">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
<label id="label-EMAIL_LETS_ENCRYPT"
|
||||
|
|
@ -491,6 +525,185 @@
|
|||
aria-labelledby="label-EMAIL_LETS_ENCRYPT"
|
||||
pattern="^.*$" />
|
||||
</div>
|
||||
<div class="col-md-6 pb-3">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
<label id="label-LETS_ENCRYPT_CHALLENGE"
|
||||
for="LETS_ENCRYPT_CHALLENGE"
|
||||
class="form-label fw-semibold text-truncate">
|
||||
Challenge Type
|
||||
</label>
|
||||
<div class="d-flex align-items-center">
|
||||
{% if lets_encrypt_challenge == "dns" %}
|
||||
<span class="badge badge-center rounded-pill bg-primary-subtle text-dark d-flex align-items-center justify-content-center p-1 me-1"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-placement="top"
|
||||
data-bs-original-title="From global configuration">
|
||||
<span class="bx bx-globe bx-xs"></span>
|
||||
</span>
|
||||
{% endif %}
|
||||
<span class="badge rounded-pill bg-secondary-subtle text-dark d-flex align-items-center justify-content-center p-1"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-placement="top"
|
||||
data-bs-original-title="The challenge type to use for Let's Encrypt (http or dns).">
|
||||
<span class="bx bx-question-mark bx-xs"></span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<select id="LETS_ENCRYPT_CHALLENGE"
|
||||
name="LETS_ENCRYPT_CHALLENGE"
|
||||
class="form-select mt-1"
|
||||
aria-labelledby="label-LETS_ENCRYPT_CHALLENGE">
|
||||
<option value="dns"
|
||||
{% if lets_encrypt_challenge == "dns" %}selected{% endif %}>
|
||||
dns
|
||||
</option>
|
||||
<option value="http"
|
||||
{% if lets_encrypt_challenge == "http" %}selected{% endif %}>
|
||||
http
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-6 pb-3">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
<label id="label-LETS_ENCRYPT_DNS_PROVIDER"
|
||||
for="LETS_ENCRYPT_DNS_PROVIDER"
|
||||
class="form-label fw-semibold text-truncate">
|
||||
DNS Provider
|
||||
</label>
|
||||
<div class="d-flex align-items-center">
|
||||
{% if lets_encrypt_dns_provider %}
|
||||
<span class="badge badge-center rounded-pill bg-primary-subtle text-dark d-flex align-items-center justify-content-center p-1 me-1"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-placement="top"
|
||||
data-bs-original-title="From global configuration">
|
||||
<span class="bx bx-globe bx-xs"></span>
|
||||
</span>
|
||||
{% endif %}
|
||||
<span class="badge rounded-pill bg-secondary-subtle text-dark d-flex align-items-center justify-content-center p-1"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-placement="top"
|
||||
data-bs-original-title="The DNS provider to use for DNS challenges.">
|
||||
<span class="bx bx-question-mark bx-xs"></span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<select id="LETS_ENCRYPT_DNS_PROVIDER"
|
||||
name="LETS_ENCRYPT_DNS_PROVIDER"
|
||||
class="form-select mt-1"
|
||||
aria-labelledby="label-LETS_ENCRYPT_DNS_PROVIDER">
|
||||
<option value="" {% if not lets_encrypt_dns_provider %}selected{% endif %}></option>
|
||||
<option value="cloudflare"
|
||||
{% if lets_encrypt_dns_provider == "cloudflare" %}selected{% endif %}>
|
||||
cloudflare
|
||||
</option>
|
||||
<option value="digitalocean"
|
||||
{% if lets_encrypt_dns_provider == "digitalocean" %}selected{% endif %}>
|
||||
digitalocean
|
||||
</option>
|
||||
<option value="dnsimple"
|
||||
{% if lets_encrypt_dns_provider == "dnsimple" %}selected{% endif %}>
|
||||
dnsimple
|
||||
</option>
|
||||
<option value="dnsmadeeasy"
|
||||
{% if lets_encrypt_dns_provider == "dnsmadeeasy" %}selected{% endif %}>
|
||||
dnsmadeeasy
|
||||
</option>
|
||||
<option value="gehirn"
|
||||
{% if lets_encrypt_dns_provider == "gehirn" %}selected{% endif %}>
|
||||
gehirn
|
||||
</option>
|
||||
<option value="google"
|
||||
{% if lets_encrypt_dns_provider == "google" %}selected{% endif %}>
|
||||
google
|
||||
</option>
|
||||
<option value="linode"
|
||||
{% if lets_encrypt_dns_provider == "linode" %}selected{% endif %}>
|
||||
linode
|
||||
</option>
|
||||
<option value="luadns"
|
||||
{% if lets_encrypt_dns_provider == "luadns" %}selected{% endif %}>
|
||||
luadns
|
||||
</option>
|
||||
<option value="nsone"
|
||||
{% if lets_encrypt_dns_provider == "nsone" %}selected{% endif %}>
|
||||
nsone
|
||||
</option>
|
||||
<option value="ovh"
|
||||
{% if lets_encrypt_dns_provider == "ovh" %}selected{% endif %}>
|
||||
ovh
|
||||
</option>
|
||||
<option value="rfc2136"
|
||||
{% if lets_encrypt_dns_provider == "rfc2136" %}selected{% endif %}>
|
||||
rfc2136
|
||||
</option>
|
||||
<option value="route53"
|
||||
{% if lets_encrypt_dns_provider == "route53" %}selected{% endif %}>
|
||||
route53
|
||||
</option>
|
||||
<option value="sakuracloud"
|
||||
{% if lets_encrypt_dns_provider == "sakuracloud" %}selected{% endif %}>
|
||||
sakuracloud
|
||||
</option>
|
||||
<option value="scaleway"
|
||||
{% if lets_encrypt_dns_provider == "scaleway" %}selected{% endif %}>
|
||||
scaleway
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-6 pb-3">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
<label id="label-LETS_ENCRYPT_DNS_PROPAGATION"
|
||||
for="LETS_ENCRYPT_DNS_PROPAGATION"
|
||||
class="form-label fw-semibold text-truncate">
|
||||
DNS Propagation
|
||||
</label>
|
||||
<div class="d-flex align-items-center">
|
||||
{% if lets_encrypt_dns_propagation != "default" %}
|
||||
<span class="badge badge-center rounded-pill bg-primary-subtle text-dark d-flex align-items-center justify-content-center p-1 me-1"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-placement="top"
|
||||
data-bs-original-title="From global configuration">
|
||||
<span class="bx bx-globe bx-xs"></span>
|
||||
</span>
|
||||
{% endif %}
|
||||
<span class="badge rounded-pill bg-secondary-subtle text-dark d-flex align-items-center justify-content-center p-1"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-placement="top"
|
||||
data-bs-original-title="The time to wait for DNS propagation in seconds for DNS challenges.">
|
||||
<span class="bx bx-question-mark bx-xs"></span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<input id="LETS_ENCRYPT_DNS_PROPAGATION"
|
||||
name="LETS_ENCRYPT_DNS_PROPAGATION"
|
||||
type="text"
|
||||
value="{{ lets_encrypt_dns_propagation }}"
|
||||
class="form-control plugin-setting mt-1"
|
||||
aria-labelledby="label-LETS_ENCRYPT_DNS_PROPAGATION"
|
||||
pattern="^(default|\d+)$" />
|
||||
</div>
|
||||
<div class="col-12 pb-3">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
<label id="label-LETS_ENCRYPT_DNS_CREDENTIAL_ITEMS"
|
||||
for="LETS_ENCRYPT_DNS_CREDENTIAL_ITEMS"
|
||||
class="form-label fw-semibold text-truncate">
|
||||
Lets encrypt dns credential items
|
||||
</label>
|
||||
<div class="d-flex align-items-center">
|
||||
<span class="badge rounded-pill bg-secondary-subtle text-dark d-flex align-items-center justify-content-center p-1"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-placement="top"
|
||||
data-bs-original-title="Configuration item that will be added to the credentials.ini file for the DNS provider (e.g. 'cloudflare_api_token 123456') for DNS challenges.">
|
||||
<span class="bx bx-question-mark bx-xs"></span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<textarea id="LETS_ENCRYPT_DNS_CREDENTIAL_ITEMS"
|
||||
name="LETS_ENCRYPT_DNS_CREDENTIAL_ITEMS"
|
||||
class="form-control plugin-setting mt-1"
|
||||
aria-labelledby="label-LETS_ENCRYPT_DNS_CREDENTIAL_ITEMS"
|
||||
pattern="^.*$"></textarea>
|
||||
</div>
|
||||
<h6 class="mt-2 mb-2 fw-bold">Custom certificate</h6>
|
||||
<div class="col-12 col-md-2 pb-3">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
|
|
|
|||
Loading…
Reference in a new issue