fix: don't hardcode path separators in conf template

davewasmer · Apr 4, 2017 · b7db54a · b7db54a
1 parent 32f24f7
commit b7db54a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/openssl.conf b/openssl.conf
@@ -7,8 +7,8 @@ default_md        = sha256
 name_opt          = ca_default
 cert_opt          = ca_default
 policy            = policy_loose
-database          = DIR/index.txt
-serial            = DIR/serial
+database          = DATABASE_PATH
+serial            = SERIAL_PATH
 prompt            = no
 
 [ policy_loose ]

diff --git a/src/index.ts b/src/index.ts
@@ -86,7 +86,10 @@ export default async function devcert(appName: string, options: Options = {}) {
 // us to minimize the need for elevated permissions while still allowing for per-app certificates.
 async function installCertificateAuthority(installCertutil: boolean): Promise<void> {
   debug(`generating openssl configuration`);
-  writeFileSync(opensslConfPath, readFileSync(opensslConfTemplate, 'utf-8').replace(/DIR/g, configDir));
+  let confTemplate = readFileSync(opensslConfTemplate, 'utf-8');
+  confTemplate = confTemplate.replace(/DATABASE_PATH/, configPath('index.txt'));
+  confTemplate = confTemplate.replace(/SERIAL_PATH/, configPath('serial'));
+  writeFileSync(opensslConfPath, confTemplate);
   debug(`generating root certificate authority key`);
   generateKey(rootKeyPath);
   debug(`generating root certificate authority certificate`);