Merge branch 'kirtangajjar-enable-ocsp-stapling' into develop-v4

Author: mbtamuli

php/class-ee-site-letsencrypt.php

@@ -309,30 +309,22 @@ private function executeFirstRequest( $domain, array $alternativeNames, $email )
 		EE::log( 'Certificate stored' );
 
 		// Post-generate actions
-		$this->moveCertsToNginxProxy( $response );
+		$this->moveCertsToNginxProxy( $domain );
 	}
 
-	private function moveCertsToNginxProxy( CertificateResponse $response ) {
-		$domain      = $response->getCertificateRequest()->getDistinguishedName()->getCommonName();
-		$privateKey  = $response->getCertificateRequest()->getKeyPair()->getPrivateKey();
-		$certificate = $response->getCertificate();
+	private function moveCertsToNginxProxy( string $domain ) {
 
-		// To handle wildcard certs
-		$domain = ltrim( $domain, '*.' );
+		$key_source_file   = strtr( $this->conf_dir . '/' . Repository::PATH_DOMAIN_KEY_PRIVATE, [ '{domain}' => $domain ] );
+		$crt_source_file   = strtr( $this->conf_dir . '/' . Repository::PATH_DOMAIN_CERT_FULLCHAIN, [ '{domain}' => $domain ] );
+		$chain_source_file = strtr( $this->conf_dir . '/' . Repository::PATH_DOMAIN_CERT_CHAIN, [ '{domain}' => $domain ] );
 
-		file_put_contents( EE_CONF_ROOT . '/nginx/certs/' . $domain . '.key', $privateKey->getPEM() );
+		$key_dest_file   = EE_CONF_ROOT . '/nginx/certs/' . $domain . '.key';
+		$crt_dest_file   = EE_CONF_ROOT . '/nginx/certs/' . $domain . '.crt';
+		$chain_dest_file = EE_CONF_ROOT . '/nginx/certs/' . $domain . '.chain.pem';
 
-		// Issuer chain
-		$issuerChain = array_map(
-			function ( Certificate $certificate ) {
-				return $certificate->getPEM();
-			}, $certificate->getIssuerChain()
-		);
-
-		// Full chain
-		$fullChainPem = $certificate->getPEM() . "\n" . implode( "\n", $issuerChain );
-
-		file_put_contents( EE_CONF_ROOT . '/nginx/certs/' . $domain . '.crt', $fullChainPem );
+		copy( $key_source_file, $key_dest_file );
+		copy( $crt_source_file, $crt_dest_file );
+		copy( $chain_source_file, $chain_dest_file );
 	}
 
 	/**
@@ -401,7 +393,7 @@ private function executeRenewal( $domain, array $alternativeNames, $force = fals
 			$this->log( 'Certificate stored' );
 
 			// Post-generate actions
-			$this->moveCertsToNginxProxy( $response );
+			$this->moveCertsToNginxProxy( $domain );
 			EE::log( 'Certificate renewed successfully!' );
 
 		}