Fix config generation

diff --git a/letsconf b/letsconf
index 9f3d9f1afd0dd7d0eb65e6c3d1399a4c40cf0e0a..7d9c0cfbe1a33b9b1a24fd76c8ade069d60b8068 100755 (executable)
--- a/letsconf
+++ b/letsconf
@@ -45,41 +45,52 @@ if (
 $config = json_encode(
        // Root array
        array(
 $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
 );
 
 # Send to stdout