rearrange acme files

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>

diff --git a/src/PMG/API2/ACMEPlugin.pm b/src/PMG/API2/ACMEPlugin.pm
index 0842966907b3ff690e0ae312fba8484599952000..4f18e0c9d85005b7e2e3a08fe432cc25573757ea 100644 (file)
--- 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 56b25f77e423b8c169b23ae23734552e1eb2a9c4..5122f71b9ee54a3a39b9e9fe15f9142349aa9f10 100644 (file)
--- 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 0c35d87a51b77e2b2ea5896ac66618c9a63ce764..e7bf2660c39cb023be5f5f51be905cd61f1dd3d9 100644 (file)
--- 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) {