jenkins-bot has submitted this change and it was merged.
Change subject: Fix Fundraising CRM installation path
......................................................................
Fix Fundraising CRM installation path
Change-Id: Ic8a99ac871720792b24ebda4c5c18c1729df55da
---
M puppet/hieradata/common.yaml
1 file changed, 2 insertions(+), 5 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
AndyRussG: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 3ae64db..3650033 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -26,9 +26,6 @@
citoid::port: 1970
citoid::log_level: info
-crm::dir: "%{hiera('mwv::services_dir')}/org.wikimedia.civicrm"
-crm::site_name: crm.local.wmftest.net
-
contenttranslation::dir:
"%{hiera('mediawiki::dir')}/extensions/ContentTranslation"
contenttranslation::cxserver::dir: "%{hiera('mwv::services_dir')}/cxserver"
contenttranslation::parsoid_url:
"http://127.0.0.1:%{::mediawiki::parsoid::port}";
@@ -66,8 +63,8 @@
contenttranslation::cxserver::cert: 'null'
contenttranslation::cxserver::workers: 2
-crm::dir: /srv/org.wikimedia.civicrm
-crm::site_name: crm.dev
+crm::dir: "%{hiera('mwv::services_dir')}/org.wikimedia.civicrm"
+crm::site_name: crm.local.wmftest.net
crm::drupal_db: drupal
crm::civicrm_db: civicrm
crm::db_user: root
--
To view, visit https://gerrit.wikimedia.org/r/246423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8a99ac871720792b24ebda4c5c18c1729df55da
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Eileen <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Pcoombe <[email protected]>
Gerrit-Reviewer: XenoRyet <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
