From: Raphaël Gertz <git@rapsys.eu>
Date: Wed, 2 Nov 2016 14:50:17 +0000 (+0100)
Subject: Fix config generation
X-Git-Tag: 2.0.3~36
X-Git-Url: https://git.rapsys.eu/acme/commitdiff_plain/f907516ba163b32e2e281b08d3ee1663d726999d?ds=sidebyside;hp=4259269fa8033fcdab0d1867b7e33b3846dc656b

Fix config generation
---

diff --git a/letsconf b/letsconf
index 9f3d9f1..7d9c0cf 100755
--- a/letsconf
+++ b/letsconf
@@ -45,41 +45,52 @@ if (
 $config = json_encode(
 	// Root array
 	array(
-		// Certificate object
-		array(
-			// Public cert
-			//XXX: required
-			'cert' => '/etc/pki/tls/certs/httpd.pem',
-			// Private key
-			//XXX: required
-			'key' => '/etc/pki/tls/private/httpd.pem',
-			// Mail address
-			//XXX: required
-			'mail' => 'example@example.com',
-			// Domain list
-			//XXX: required
-			'domains' => array(
-				'www.example.com',
-				'example.com'
+		//Thumbprint file
+		'thumbprint' => '/etc/acmepl/thumbprint',
+		//Certificate array
+		'certificates' => array(
+			// Certificate object
+			array(
+				// Public cert
+				//XXX: required
+				'cert' => '/etc/pki/tls/certs/httpd.pem',
+				// Private key
+				//XXX: required
+				'key' => '/etc/pki/tls/private/httpd.pem',
+				// Mail address
+				//XXX: required
+				'mail' => 'webmaster@example.com',
+				// Root domain
+				//XXX: required
+				'domain' => 'www.example.com',
+				// Domain list
+				//XXX: required
+				'domains' => array(
+					'example.com',
+					#...
+				),
+				// Production certificate
+				//XXX: optional
+				//XXX: set to 1 for production
+				'prod' => 0
 			),
-			// Production certificate
-			//XXX: optional
-			//XXX: set to 1 for production
-			'prod' => 0
-		),
-		// Other certificate
-		array(
-			'cert' => '/etc/ssl/certs/apache.crt',
-			'key' => '/etc/ssl/private/apache.key',
-			'mail' => 'example@example.com',
-			'domains' => array(
-				'other.example.com',
-				'example.com'
+			// Other certificate
+			array(
+				'cert' => '/etc/ssl/certs/apache.crt',
+				'key' => '/etc/ssl/private/apache.key',
+				'mail' => 'postmaster@example.com',
+				'domain' => 'mail.example.com',
+				'domains' => array(
+					'imap.example.com',
+					'smtp.example.com'
+				),
+				'prod' => 0
 			),
-			'prod' => 0
-		),
-		#...
-	)
+			#...
+		)
+	),
+	// Product a nice result
+	JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES
 );
 
 # Send to stdout