Merge pull request #650 from demeritcowboy/dbssl

Fix unreplaced template vars in civicrm.settings.php when using drush installer
civicrm · Apr 26, 2023 · 9ba8e6d · 9ba8e6d
2 parents ab48458 + aac107f
commit 9ba8e6d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/drush/civicrm.drush.inc b/drush/civicrm.drush.inc
@@ -494,6 +494,9 @@ function _civicrm_generate_settings_file($dbuser, $dbpass, $dbhost, $dbname, $mo
     'CMSdbPass' => $db_spec['password'],
     'CMSdbHost' => $db_spec['host'],
     'CMSdbName' => $db_spec['database'],
+    // These two are only filled in when using the newer civicrm-setup.
+    'dbSSL' => '',
+    'CMSdbSSL' => '',
     'siteKey' => preg_replace(';[^a-zA-Z0-9];', '', base64_encode(random_bytes(37))),
     'credKeys' => 'aes-cbc:hkdf-sha256:' . preg_replace(';[^a-zA-Z0-9];', '', base64_encode(random_bytes(37))),
     'signKeys' => 'jwt-hs256:hkdf-sha256:' . preg_replace(';[^a-zA-Z0-9];', '', base64_encode(random_bytes(37))),