Awight has submitted this change and it was merged.

Change subject: Update fundraising CRM configuration
......................................................................


Update fundraising CRM configuration

Requires composer to install dependencies.

Change-Id: I1028299e4b63201cda3028f83d1609274af3a7ec
---
M puppet/modules/crm/manifests/init.pp
1 file changed, 7 insertions(+), 3 deletions(-)

Approvals:
  20after4: 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 44f1cb3..771c851 100644
--- a/puppet/modules/crm/manifests/init.pp
+++ b/puppet/modules/crm/manifests/init.pp
@@ -43,6 +43,11 @@
         directory => $dir,
     }
 
+    php::composer::install { 'crm-composer':
+        directory => $dir,
+        require => Git::Clone[$repo],
+    }
+
     # required by module ganglia_reporter
     package { 'ganglia-monitor': }
 
@@ -89,8 +94,7 @@
             'environment_indicator_text'     => 'DEVELOPMENT',
             'environment_indicator_position' => 'left',
             'environment_indicator_color'    => '#3FBF57',
-            'wmf_common_phpmailer_location'  => $::phpmailer::dir,
-            'wmf_common_twig_location'       => "${::twig::dir}/current",
-        }
+        },
+        require => Php::Composer::Install['crm-composer'],
     }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1028299e4b63201cda3028f83d1609274af3a7ec
Gerrit-PatchSet: 2
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: Ejegg <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to