From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0BAD56BAD7 for ; Thu, 18 Mar 2021 09:52:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 00216E66C for ; Thu, 18 Mar 2021 09:52:04 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 829FBE663 for ; Thu, 18 Mar 2021 09:52:03 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 46F7B42815 for ; Thu, 18 Mar 2021 09:52:03 +0100 (CET) From: Wolfgang Bumiller To: pmg-devel@lists.proxmox.com Date: Thu, 18 Mar 2021 09:51:58 +0100 Message-Id: <20210318085158.27581-1-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [certhelpers.pm, cluster.pm, acmeplugin.pm] Subject: [pmg-devel] [PATCH api] rearrange acme files X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Mar 2021 08:52:04 -0000 Old layout: /etc/pmg/acme-plugins.conf /etc/pmg/acme/ New layout: /etc/pmg/acme/plugins.conf /etc/pmg/acme/accounts/ Signed-off-by: Wolfgang Bumiller --- Since this hasn't been packaged yet this should be fine. src/PMG/API2/ACMEPlugin.pm | 2 +- src/PMG/CertHelpers.pm | 2 +- src/PMG/Cluster.pm | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/PMG/API2/ACMEPlugin.pm b/src/PMG/API2/ACMEPlugin.pm index 0842966..4f18e0c 100644 --- a/src/PMG/API2/ACMEPlugin.pm +++ b/src/PMG/API2/ACMEPlugin.pm @@ -15,7 +15,7 @@ use PVE::Tools qw(extract_param); use base qw(PVE::RESTHandler); my $inotify_file_id = 'pmg-acme-plugins-config.conf'; -my $config_filename = '/etc/pmg/acme-plugins.conf'; +my $config_filename = '/etc/pmg/acme/plugins.conf'; my $lockfile = "/var/lock/pmg-acme-plugins-config.lck"; PVE::ACME::DNSChallenge->register(); diff --git a/src/PMG/CertHelpers.pm b/src/PMG/CertHelpers.pm index 56b25f7..5122f71 100644 --- a/src/PMG/CertHelpers.pm +++ b/src/PMG/CertHelpers.pm @@ -12,7 +12,7 @@ use constant { SMTP_CERT => '/etc/pmg/pmg-tls.pem', }; -my $account_prefix = '/etc/pmg/acme'; +my $account_prefix = '/etc/pmg/acme/accounts'; # TODO: Move `pve-acme-account-name` to common and reuse instead of this. PVE::JSONSchema::register_standard_option('pmg-acme-account-name', { diff --git a/src/PMG/Cluster.pm b/src/PMG/Cluster.pm index 0c35d87..e7bf266 100644 --- a/src/PMG/Cluster.pm +++ b/src/PMG/Cluster.pm @@ -458,7 +458,6 @@ sub sync_config_from_master { 'transport', 'tls_policy', 'fetchmailrc', - 'acme-plugins.conf', ]; foreach my $filename (@$files) { -- 2.20.1