Currently, deploying via provision_civicrm on D6 will result in civicrm.settings.php using the "Drupal" UF, which is for D7.

CommentFileSizeAuthor
#1 provision_civicrm-1549850-civcrm.settings.patch10.51 KBxurizaemon

Comments

xurizaemon’s picture

xurizaemon
he/him
Location Ōtepoti, Aotearoa 🏝
commented
StatusFileSize
new provision_civicrm-1549850-civcrm.settings.patch10.51 KB

updated civicrm.settings.php.tpl, which is part of the solution (at least it documents the new UF values!)

will look at detecting and setting correct CIVICRM_UF shortly

xurizaemon’s picture

xurizaemon
he/him
Location Ōtepoti, Aotearoa 🏝
commented
Status: Active » Needs work

not complete

bgm’s picture

bgm commented
Status: Needs work » Fixed

I applied two changes to 6.x-1.x:

* removed the forked civicrm.settings.php.tpl: we can now use the one provided by CiviCRM (version-specific). This was initially forked because prior to 3.4, the siteKey was not a smarty variable in the civicrm.settings.php and had to be filled in manually by the user.

The only limitation of going back to the civicrm.settings.php.tpl is that, if you want to edit some constants, well, you can't. It would be nice to have a "if (! defined(FOO)) { define(FOO); }" so that we could override the constants in the local.settings.php. Should be proposed upstream.

* patch the drush module (upstream + merged) to check the major drupal version. https://fisheye2.atlassian.com/changelog/CiviCRM?cs=40263

bgm’s picture

bgm commented

Hmm, after more testing, I realized that this would break CiviCRM 3.x installs (since they expect the UF to be 'Drupal', not 'Drupal6').

Committed another patch upstream:
https://fisheye2.atlassian.com/changelog/CiviCRM?cs=40264

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.