[MediaWiki-commits] [Gerrit] Workaround socket error with pdo-mysql, use TCP instead - change (mediawiki/vagrant)

[Awight (Code Review)]

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/234033

Change subject: Workaround socket error with pdo-mysql, use TCP instead
......................................................................

Workaround socket error with pdo-mysql, use TCP instead

Bad HHVM-MySQL behavior when we use a hostname of "localhost", triggering
a socket connection:

    SQLSTATE[HY000] [2002] Can't connect to local MySQL server through socket 
'/dev/null'

Change-Id: I647bac12797f8beced6009b327abe2b4a1f96bfe
---
M puppet/modules/crm/templates/civicrm-install.php.erb
M puppet/modules/crm/templates/settings.php.erb
2 files changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/33/234033/1

diff --git a/puppet/modules/crm/templates/civicrm-install.php.erb 
b/puppet/modules/crm/templates/civicrm-install.php.erb
index 74d7058..7f625d4 100644
--- a/puppet/modules/crm/templates/civicrm-install.php.erb
+++ b/puppet/modules/crm/templates/civicrm-install.php.erb
@@ -6,13 +6,13 @@
     'mysql' => array(
         'username' => "<%= scope['::crm::db_user'] %>",
         'password' => "<%= scope['::crm::db_pass'] %>",
-        'server' => 'localhost',
+        'server' => '127.0.0.1',
         'database' => "<%= scope['::crm::civicrm_db'] %>",
     ),
     'drupal' => array(
         'username' => "<%= scope['::crm::db_user'] %>",
         'password' => "<%= scope['::crm::db_pass'] %>",
-        'server' => 'localhost',
+        'server' => '127.0.0.1',
         'database' => "<%= scope['::crm::drupal_db'] %>",
     ),
 );
diff --git a/puppet/modules/crm/templates/settings.php.erb 
b/puppet/modules/crm/templates/settings.php.erb
index 98a34eb..52a44ba 100644
--- a/puppet/modules/crm/templates/settings.php.erb
+++ b/puppet/modules/crm/templates/settings.php.erb
@@ -1,5 +1,6 @@
 <?php
-# This file is managed by Puppet.
+# This file is managed by Puppet. Edit settings.local.php if you want to make
+# local changes.
 
 define( 'WMF_UNSUB_SALT', 'vagrant' );
 
@@ -16,7 +17,7 @@
         'database' => $db,
         'username' => '<%= @db_user %>',
         'password' => '<%= @db_pass %>',
-        'host' => 'localhost',
+        'host' => '127.0.0.1', // FIXME: Use socket
         'prefix' => '',
     );
 }
@@ -28,3 +29,8 @@
 
 # FIXME: That's annoying.
 require_once __DIR__ . '/../../vendor/autoload.php';
+
+# Include local overrides.
+if ( file_exists( __DIR__ . '/settings.local.php' ) ) {
+    require_once __DIR__ . '/settings.local.php';
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I647bac12797f8beced6009b327abe2b4a1f96bfe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>

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