Skip to content

Commit

Permalink
conflict fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas DENOLLE committed May 7, 2020
2 parents eef600d + df56e53 commit 6338083
Showing 1 changed file with 7 additions and 41 deletions.
48 changes: 7 additions & 41 deletions src/Commands/SslCertificateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ public function sslCertificateList(
$table
->addRows(
[
[
$certificate->id,
$certificate->label,
implode("\n", $certificate->domains),
$certificate->expires_at,
$certificate->flags->active ? '' : '',
],
[
$certificate->id,
$certificate->label,
implode("\n", $certificate->domains),
$certificate->expires_at,
$certificate->flags->active ? '' : '',
],
]
);
}
Expand All @@ -70,7 +70,6 @@ public function sslCertificateList(
* @command ssl:info
*/
public function sslCertificateInfo(
OutputInterface $output,
SslCertificates $certificatesAdapter,
$uuid,
$environment,
Expand Down Expand Up @@ -134,37 +133,4 @@ public function sslCertificateDisable(
$this->waitForNotification($response);
}
}

/**
* Install an SSL certificate.
*
* @param string $uuid
* @param string $environment
* @param string $label
* @param string $cert
* @param string $key
* @param null|string $ca
*
* @command ssl:create
*/
public function sslCertificateCreate(
OutputInterface $output,
SslCertificates $certificatesAdapter,
$uuid,
$environment,
$label,
$cert,
$key,
$ca = null
) {
$environment = $this->cloudapiService->getEnvironment($uuid, $environment);
$this->say(sprintf('Installing new certificate (%s)', $label));
$certificatesAdapter->create(
$environment->uuid,
$label,
$cert,
$key,
$ca
);
}
}

0 comments on commit 6338083

Please sign in to comment.