From f1a53d2b6843a07384feb3ebcefd1b30c0592c83 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Tue, 11 Jun 2013 15:59:48 +0200
Subject: [PATCH] Fix upgrade

---
 lib/classes/patch/3807.php   | 8 +++++---
 lib/conf.d/configuration.yml | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/classes/patch/3807.php b/lib/classes/patch/3807.php
index a40fe79dfa..63747e2d2f 100644
--- a/lib/classes/patch/3807.php
+++ b/lib/classes/patch/3807.php
@@ -139,9 +139,11 @@ class patch_3807 implements patchInterface
 
     private function migrateConnexions(array &$conf)
     {
-        $data = $this->yaml->parse($this->connexionsYaml);
+        if (is_file($this->connexionsYaml)) {
+            $data = $this->yaml->parse($this->connexionsYaml);
 
-        $conf['main']['database'] = $data['main_connexion'];
-        $conf['main']['database-test'] = $data['test_connexion'];
+            $conf['main']['database'] = $data['main_connexion'];
+            $conf['main']['database-test'] = $data['test_connexion'];
+        }
     }
 }
diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml
index ceb3177653..2256210b14 100644
--- a/lib/conf.d/configuration.yml
+++ b/lib/conf.d/configuration.yml
@@ -2,11 +2,11 @@ main:
     servername: 'http://local.phrasea/'
     maintenance: false
     database:
-        host: 127.0.0.1
+        host: 'sql-host'
         port: '3306'
-        user: root
-        password: ''
-        dbname: ab_test
+        user: 'sql-user'
+        password: 'sql-password'
+        dbname: ab_phraseanet
         driver: pdo_mysql
         charset: UTF8
     database-test: