* [pmg-devel] [PATCH api] rearrange acme files
@ 2021-03-18 8:51 Wolfgang Bumiller
2021-03-18 10:34 ` [pmg-devel] applied: " Thomas Lamprecht
0 siblings, 1 reply; 2+ messages in thread
From: Wolfgang Bumiller @ 2021-03-18 8:51 UTC (permalink / raw)
To: pmg-devel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pmg-devel] applied: [PATCH api] rearrange acme files
2021-03-18 8:51 [pmg-devel] [PATCH api] rearrange acme files Wolfgang Bumiller
@ 2021-03-18 10:34 ` Thomas Lamprecht
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lamprecht @ 2021-03-18 10:34 UTC (permalink / raw)
To: Wolfgang Bumiller, pmg-devel
On 18.03.21 09:51, Wolfgang Bumiller wrote:
> 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(-)
>
>
applied, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-18 10:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-18 8:51 [pmg-devel] [PATCH api] rearrange acme files Wolfgang Bumiller
2021-03-18 10:34 ` [pmg-devel] applied: " Thomas Lamprecht
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox