From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH api] rearrange acme files
Date: Thu, 18 Mar 2021 09:51:58 +0100 [thread overview]
Message-ID: <20210318085158.27581-1-w.bumiller@proxmox.com> (raw)
Old layout:
/etc/pmg/acme-plugins.conf
/etc/pmg/acme/<account_name>
New layout:
/etc/pmg/acme/plugins.conf
/etc/pmg/acme/accounts/<account_name>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
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
next reply other threads:[~2021-03-18 8:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 8:51 Wolfgang Bumiller [this message]
2021-03-18 10:34 ` [pmg-devel] applied: " Thomas Lamprecht
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=20210318085158.27581-1-w.bumiller@proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=pmg-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.