acme: separate flag to disable the 'domains=' array

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>

diff --git a/src/panel/ACMEDomains.js b/src/panel/ACMEDomains.js
index 6cfc5017517e543938641666628c94f43c96968b..a7fb08859d78263064a17351665c977688b861e9 100644 (file)
--- 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 930a4c30f1bdbd28996dbdc9f99a1960fb8d5494..b040e33bcd8408e794ce2eb548a3d7d3ff0b3ffc 100644 (file)
--- 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();
                    }