jenkins-bot has submitted this change and it was merged.
Change subject: Correct path to drush wrapper
......................................................................
Correct path to drush wrapper
Change-Id: I990e3d429c9e17e51040eb76c1a7c13bd4645224
---
M puppet/modules/crm/manifests/drupal.pp
M puppet/modules/crm/manifests/drush.pp
M puppet/modules/crm/templates/drupal-install.sh.erb
3 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/crm/manifests/drupal.pp
b/puppet/modules/crm/manifests/drupal.pp
index 3aa78a6..06856e0 100644
--- a/puppet/modules/crm/manifests/drupal.pp
+++ b/puppet/modules/crm/manifests/drupal.pp
@@ -85,7 +85,7 @@
}
exec { 'enable_drupal_modules':
- command => inline_template('<%= scope["::crm::drush::cmd"] %>
pm-enable <%= @modules.join(" ") %>'),
+ command => inline_template('<%= scope["::crm::drush::wrapper"] %>
pm-enable <%= @modules.join(" ") %>'),
refreshonly => true,
subscribe => [
Exec['drupal_db_install'],
diff --git a/puppet/modules/crm/manifests/drush.pp
b/puppet/modules/crm/manifests/drush.pp
index 6109985..dd2cf8b 100644
--- a/puppet/modules/crm/manifests/drush.pp
+++ b/puppet/modules/crm/manifests/drush.pp
@@ -7,7 +7,10 @@
require_package('drush')
- file { '/usr/local/bin/drush':
+ # FIXME: Correctly handle path everywhere.
+ $wrapper = '/usr/local/bin/drush'
+
+ file { $wrapper:
ensure => present,
mode => '0755',
content => template('crm/drush-wrapper.sh.erb'),
diff --git a/puppet/modules/crm/templates/drupal-install.sh.erb
b/puppet/modules/crm/templates/drupal-install.sh.erb
index 7aa19ac..40e65b8 100644
--- a/puppet/modules/crm/templates/drupal-install.sh.erb
+++ b/puppet/modules/crm/templates/drupal-install.sh.erb
@@ -1,6 +1,6 @@
#!/bin/bash
-<%= scope['::crm::drush::bare_cmd'] %> \
+<%= scope['::crm::drush::wrapper'] %> \
site-install standard \
--db-url='<%= @db_url %>' \
--site-name='<%= scope['::crm::site_name'] %>' \
--
To view, visit https://gerrit.wikimedia.org/r/227388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I990e3d429c9e17e51040eb76c1a7c13bd4645224
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight <[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: Ejegg <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Ssmith <[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
