@cloud-cli/le 1.1.4 → 1.2.1

package/README.md

@@ -11,10 +11,10 @@ Requires `certbot` to be installed on server and properly configured for Let's E
 cy le.add --domain example.com
 ```
 
-**Update a certificate with domain example.com and all its subdomains**
+**Update a certificate with domain example.com and subdomains**
 
 ```
-cy le.add --domain example.com --useWildcard 1 --update
+cy le.add --domains example.com,foo.example.com --useWildcard true --update
 ```
 
 **Remove a certificate**

package/dist/certificate-manager.d.ts

@@ -5,6 +5,7 @@ export interface Certificate {
 }
 export interface CertificateOptions {
     domain: string;
+    domains?: string;
 }
 export interface CreateCertificateOptions extends CertificateOptions {
     useWildcard: boolean;
@@ -14,7 +15,7 @@ export interface CreateCertificateOptions extends CertificateOptions {
 export declare class CertificateManager {
     private readonly domainPattern;
     certificateExists({ domain }: CertificateOptions): boolean;
-    createCertificate({ domain, useWildcard, additionalOptions, update }: CreateCertificateOptions): true | Promise<string>;
+    createCertificate({ domain, domains, useWildcard, additionalOptions, update }: CreateCertificateOptions): true | Promise<string>;
     removeCertificate({ domain }: CertificateOptions): boolean;
     getCertificateList(): string[];
     getCertificate({ domain }: CertificateOptions): Promise<string>;

package/dist/certificate-manager.js

@@ -12,16 +12,19 @@ export class CertificateManager {
         }
         return existsSync(join(certificatesFolder, domain));
     }
-    createCertificate({ domain, useWildcard, additionalOptions, update }) {
-        if (!this.isValidDomain(domain)) {
-            throw new Error('Invalid domain: ' + domain);
-        }
+    createCertificate({ domain, domains, useWildcard, additionalOptions, update }) {
         const path = join(certificatesFolder, domain);
         if (existsSync(path) && !update) {
             return true;
         }
-        const domains = [domain, useWildcard ? '*.' + domain : ''].filter(Boolean);
-        const domainsWithPrefix = domains.flatMap((domain) => ['-d', domain]);
+        const listOfDomains = domains ? domains.split(',').map(s => s.trim()) : [domain];
+        for (const d of listOfDomains) {
+            if (!this.isValidDomain(d)) {
+                throw new Error('Invalid domain: ' + d);
+            }
+        }
+        const domainsWithStar = !useWildcard ? listOfDomains : listOfDomains.flatMap(d => [d, '*.' + d]);
+        const domainsWithPrefix = domainsWithStar.flatMap((domain) => ['-d', domain]);
         const out = sh('certbot', ['certonly', ...(additionalOptions || []), ...domainsWithPrefix]);
         const stdout = String(out.stdout || '');
         const stderr = String(out.stderr || '').split('\n').map(s => '! ' + s).join('\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/le",
-  "version": "1.1.4",
+  "version": "1.2.1",
   "description": "LetsEncrypt integration for Cloudy",
   "type": "module",
   "main": "./dist/index.js",