Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1747_PORT_PHRAS-1301

resources/ansible/roles/app/templates/configuration.tpl

@@ -12,7 +12,7 @@ main:
         port: 3306
         user: '{{ mariadb.user }}'
         password: '{{ mariadb.password }}'
-        dbname: '{{ mariadb.database }}'
+        dbname: '{{ mariadb.appbox_db }}'
         driver: pdo_mysql
         charset: UTF8
     database-test:

resources/ansible/roles/mariadb/tasks/main.yml

@@ -47,7 +47,7 @@
     - "{{ mariadb.alt_databox_db }}"
 
 - name: mariadb | Import dump
-  mysql_db: name={{ mariadb.database }} state=import login_user=root login_password={{ mariadb.root_password }} target=/vagrant/{{ mariadb.dump }}
+  mysql_db: name={{ mariadb.appbox_db }} state=import login_user=root login_password={{ mariadb.root_password }} target=/vagrant/{{ mariadb.dump }}
   when: mariadb.dump
 
 - name: mariadb | Create users

resources/ansible/vars/all.yml

@@ -41,7 +41,7 @@ nginx:
 mariadb:
     install: '1'
     root_password: toor
-    database: ab_master
+    appbox_db: ab_master
     databox_db: db_master
     alt_databox_db: db_alt
     user: phraseanet