Merge pull request #789 from ghostwheel42/master

fix acme operations when using multiple accounts
This commit is contained in:
Frank Wall 2018-08-14 18:15:40 +02:00 committed by GitHub
commit 9e5fbd8a8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -319,10 +319,14 @@ function run_acme_account_registration($acctObj, $certObj, $modelObj)
$account_conf_dir = "/var/etc/acme-client/accounts/" . $acctObj->id;
$account_conf_file = $account_conf_dir . "/account.conf";
$account_key_file = $account_conf_dir . "/account.key";
$account_json_file = $account_conf_dir . "/account.json";
$account_ca_file = $account_conf_dir . "/ca.conf";
$acme_conf = array();
$acme_conf[] = "CERT_HOME='/var/etc/acme-client/home'";
$acme_conf[] = "LOG_FILE='/var/log/acme.sh.log'";
$acme_conf[] = "ACCOUNT_KEY_PATH='" . $account_key_file . "'";
$acme_conf[] = "ACCOUNT_JSON_PATH='" . $account_json_file . "'";
$acme_conf[] = "CA_CONF='" . $account_ca_file . "'";
if (!empty((string)$acctObj->email)) {
$acme_conf[] = "ACCOUNT_EMAIL='" . (string)$acctObj->email . "'";
}