[MediaWiki-commits] [Gerrit] Set civicrm resource URL - change (mediawiki/vagrant)

[Ejegg (Code Review)]

Ejegg has submitted this change and it was merged.

Change subject: Set civicrm resource URL
......................................................................


Set civicrm resource URL

This may have been damaged since the Civi 4.4 upgrade.  The resource URL
is where we'll serve scripts and stylesheets.

Change-Id: I930815f374006b187f240aa7fa83dd621c9bf25a
---
M puppet/modules/crm/manifests/init.pp
M puppet/modules/crm/templates/civicrm-install.php.erb
M puppet/modules/crm/templates/settings.php.erb
3 files changed, 12 insertions(+), 7 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/crm/manifests/init.pp 
b/puppet/modules/crm/manifests/init.pp
index ac581a6..eb1037c 100644
--- a/puppet/modules/crm/manifests/init.pp
+++ b/puppet/modules/crm/manifests/init.pp
@@ -31,6 +31,7 @@
     $db_pass,
 ) {
     $repo = 'wikimedia/fundraising/crm'
+    $base_url = "http://${::crm::site_name}${::port_fragment}/";
 
     include ::php
     include ::postfix
diff --git a/puppet/modules/crm/templates/civicrm-install.php.erb 
b/puppet/modules/crm/templates/civicrm-install.php.erb
index c428d97..8840a53 100644
--- a/puppet/modules/crm/templates/civicrm-install.php.erb
+++ b/puppet/modules/crm/templates/civicrm-install.php.erb
@@ -2,18 +2,18 @@
 
 $config = array(
     'site_dir' => 'default',
-    'base_url' => "http://<%= @site_name %><%= scope['::port_fragment'] %>/",
+    'base_url' => '<%= scope['::crm::base_url'] %>',
     'mysql' => array(
-        'username' => "<%= scope['::crm::db_user'] %>",
-        'password' => "<%= scope['::crm::db_pass'] %>",
+        'username' => '<%= scope['::crm::db_user'] %>',
+        'password' => '<%= scope['::crm::db_pass'] %>',
         'server' => '127.0.0.1',
-        'database' => "<%= scope['::crm::civicrm_db'] %>",
+        'database' => '<%= scope['::crm::civicrm_db'] %>',
     ),
     'drupal' => array(
-        'username' => "<%= scope['::crm::db_user'] %>",
-        'password' => "<%= scope['::crm::db_pass'] %>",
+        'username' => '<%= scope['::crm::db_user'] %>',
+        'password' => '<%= scope['::crm::db_pass'] %>',
         'server' => '127.0.0.1',
-        'database' => "<%= scope['::crm::drupal_db'] %>",
+        'database' => '<%= scope['::crm::drupal_db'] %>',
     ),
 );
 
diff --git a/puppet/modules/crm/templates/settings.php.erb 
b/puppet/modules/crm/templates/settings.php.erb
index 52a44ba..5168711 100644
--- a/puppet/modules/crm/templates/settings.php.erb
+++ b/puppet/modules/crm/templates/settings.php.erb
@@ -27,6 +27,10 @@
     $conf['<%= k %>'] = '<%= v %>';
 <% end %>
 
+# TODO: Move to civicrm.settings.php and use CIVICRM_UF_BASEURL constant
+global $civicrm_setting;
+$civicrm_setting['URL Preferences']['userFrameworkResourceURL'] = '<%= 
scope['::crm::base_url'] %>sites/all/modules/civicrm';
+
 # FIXME: That's annoying.
 require_once __DIR__ . '/../../vendor/autoload.php';
 

-- 
To view, visit https://gerrit.wikimedia.org/r/274642
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I930815f374006b187f240aa7fa83dd621c9bf25a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: AndyRussG <andrew.green...@gmail.com>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Eileen <emcnaugh...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Katie Horn <kh...@wikimedia.org>
Gerrit-Reviewer: Pcoombe <pcoo...@wikimedia.org>
Gerrit-Reviewer: XenoRyet <dkozlow...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits