public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [RFC widget-toolkit] acme: separate flag to disable the 'domains=' array
Date: Fri, 16 Apr 2021 15:35:17 +0200	[thread overview]
Message-ID: <20210416133517.23349-25-w.bumiller@proxmox.com> (raw)
In-Reply-To: <20210416133517.23349-1-w.bumiller@proxmox.com>

PVE has 2 domain lists, PMG only 1 since it requires the
additional type.

In PBS I do not want to have 2 lists either, since it seems
rather inconvenient to have 2 different ways to access the
same list.

Currently we decide this based on whether we have multiple
certificate types, which in PBS we don't, so we need a
separate option for this.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
 src/panel/ACMEDomains.js  | 4 ++++
 src/window/ACMEDomains.js | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/panel/ACMEDomains.js b/src/panel/ACMEDomains.js
index 6cfc501..a7fb088 100644
--- a/src/panel/ACMEDomains.js
+++ b/src/panel/ACMEDomains.js
@@ -21,6 +21,8 @@ Ext.define('Proxmox.panel.ACMEDomains', {
     domainUsages: undefined,
     // if no domainUsages parameter is supllied, the orderUrl is required instead:
     orderUrl: undefined,
+    // Force the use of 'acmedomainX' properties.
+    separateDomainEntries: undefined,
 
     acmeUrl: undefined,
 
@@ -87,6 +89,7 @@ Ext.define('Proxmox.panel.ACMEDomains', {
 		acmeUrl: view.acmeUrl,
 		nodeconfig: view.nodeconfig,
 		domainUsages: view.domainUsages,
+		separateDomainEntries: view.separateDomainEntries,
 		apiCallDone: function() {
 		    me.reload();
 		},
@@ -105,6 +108,7 @@ Ext.define('Proxmox.panel.ACMEDomains', {
 		acmeUrl: view.acmeUrl,
 		nodeconfig: view.nodeconfig,
 		domainUsages: view.domainUsages,
+		separateDomainEntries: view.separateDomainEntries,
 		domain: selection[0].data,
 		apiCallDone: function() {
 		    me.reload();
diff --git a/src/window/ACMEDomains.js b/src/window/ACMEDomains.js
index 930a4c3..b040e33 100644
--- a/src/window/ACMEDomains.js
+++ b/src/window/ACMEDomains.js
@@ -16,6 +16,9 @@ Ext.define('Proxmox.window.ACMEDomainEdit', {
     // For PMG the we have multiple certificates, so we have a "usage" attribute & column.
     domainUsages: undefined,
 
+    // Force the use of 'acmedomainX' properties.
+    separateDomainEntries: undefined,
+
     cbindData: function(config) {
 	let me = this;
 	return {
@@ -50,7 +53,7 @@ Ext.define('Proxmox.window.ACMEDomainEdit', {
 		};
 
 		// If we have a 'usage' property (pmg), we only use the `acmedomainX` config keys.
-		if (win.domainUsages) {
+		if (win.separateDomainEntries || win.domainUsages) {
 		    if (!configkey || configkey === 'acme') {
 			configkey = find_free_slot();
 		    }
-- 
2.20.1





  parent reply	other threads:[~2021-04-16 13:36 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-16 13:34 [pbs-devel] [RFC backup 00/23] Implements ACME suport for PBS Wolfgang Bumiller
2021-04-16 13:34 ` [pbs-devel] [RFC backup 01/23] systemd: add reload_unit Wolfgang Bumiller
2021-04-16 13:34 ` [pbs-devel] [RFC backup 02/23] add dns alias schema Wolfgang Bumiller
2021-04-16 13:34 ` [pbs-devel] [RFC backup 03/23] tools::fs::scan_subdir: use nix::Error instead of anyhow Wolfgang Bumiller
2021-04-16 13:34 ` [pbs-devel] [RFC backup 04/23] tools::http: generic 'fn request' and dedup agent string Wolfgang Bumiller
2021-04-16 13:34 ` [pbs-devel] [RFC backup 05/23] config: factor out certificate writing Wolfgang Bumiller
2021-04-16 13:34 ` [pbs-devel] [RFC backup 06/23] CertInfo: add not_{after, before}_unix Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 07/23] CertInfo: add is_expired_after_epoch Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 08/23] tools: add ControlFlow type Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 09/23] catalog shell: replace LoopState with ControlFlow Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 10/23] Cargo.toml: depend on proxmox-acme-rs Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 11/23] bump d/control Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 12/23] config::acl: make /system/certificates a valid path Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 13/23] add 'config file format' to tools::config Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 14/23] add node config Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 15/23] add acme config Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 16/23] add async acme client implementation Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 17/23] add config/acme api path Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 18/23] add node/{node}/certificates api call Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 19/23] add node/{node}/config api path Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 20/23] add acme commands to proxmox-backup-manager Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 21/23] implement standalone acme validation Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 22/23] ui: add certificate & acme view Wolfgang Bumiller
2021-04-16 13:35 ` [pbs-devel] [RFC backup 23/23] daily-update: check acme certificates Wolfgang Bumiller
2021-04-16 13:35 ` Wolfgang Bumiller [this message]
2021-04-22 17:57   ` [pbs-devel] applied: [RFC widget-toolkit] acme: separate flag to disable the 'domains=' array Thomas Lamprecht
2021-04-20 10:27 ` [pbs-devel] [RFC backup 00/23] Implements ACME suport for PBS Dominic Jäger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210416133517.23349-25-w.bumiller@proxmox.com \
    --to=w.bumiller@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal