From 9b2ffed73725f4210b4e557d2f3263560f0eb4fb Mon Sep 17 00:00:00 2001 From: Xavier Rousset Date: Fri, 21 Apr 2017 18:08:29 +0200 Subject: [PATCH 1/5] Update Vagrant provisionning. fix mariaDB vars names, fix windows.sh paths --- resources/ansible/roles/mariadb/tasks/main.yml | 6 +++--- resources/ansible/windows-always.sh | 2 ++ resources/ansible/windows.sh | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 resources/ansible/windows-always.sh diff --git a/resources/ansible/roles/mariadb/tasks/main.yml b/resources/ansible/roles/mariadb/tasks/main.yml index c28b0fb19e..55b0ece691 100644 --- a/resources/ansible/roles/mariadb/tasks/main.yml +++ b/resources/ansible/roles/mariadb/tasks/main.yml @@ -41,9 +41,9 @@ - name: mariadb | Create databases mysql_db: name={{ item }} state=present login_user=root login_password={{ mariadb.root_password }} with_items: - - "{{ mariadb.database }}" - - "{{ mariadb.databox_db }}" - - "{{ mariadb.alt_db }}" +    - "{{ mariadb.appbox_db }}" +    - "{{ mariadb.databox_db }}" +    - "{{ 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 }} diff --git a/resources/ansible/windows-always.sh b/resources/ansible/windows-always.sh new file mode 100644 index 0000000000..fe32d32067 --- /dev/null +++ b/resources/ansible/windows-always.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +sudo ansible-playbook /vagrant/resources/ansible/playbook-always.yml -e hostname=$1 --extra-vars "{\"hostname\": \"$1\", \"postfix\": { \"postfix_domain\": \"$1.vb\" }, \"parade_var\": \"$2\" }" --connection=local diff --git a/resources/ansible/windows.sh b/resources/ansible/windows.sh index eab5d9a5bf..65573918a0 100644 --- a/resources/ansible/windows.sh +++ b/resources/ansible/windows.sh @@ -25,7 +25,7 @@ sudo apt-get update sudo apt-get install -y ansible # Setup Ansible for Local Use and Run -cp /vagrant/ansible/inventories/dev /etc/ansible/hosts -f +cp /vagrant/resources/ansible/inventories/dev /etc/ansible/hosts -f chmod 666 /etc/ansible/hosts -cat /vagrant/ansible/files/authorized_keys >> /home/vagrant/.ssh/authorized_keys -sudo ansible-playbook /vagrant/ansible/playbook.yml -e hostname=$1 --connection=local \ No newline at end of file +cat /vagrant/resources/ansible/files/authorized_keys >> /home/vagrant/.ssh/authorized_keys +sudo ansible-playbook /vagrant/resources/ansible/playbook.yml -e hostname=$1 --connection=local \ No newline at end of file From 3c3d324fc5e8b7ea602816c6d3d681a52d8f14fd Mon Sep 17 00:00:00 2001 From: Xavier Rousset Date: Wed, 3 May 2017 12:08:30 +0200 Subject: [PATCH 2/5] Go travis ! go ! --- resources/ansible/roles/mariadb/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/ansible/roles/mariadb/tasks/main.yml b/resources/ansible/roles/mariadb/tasks/main.yml index 55b0ece691..61e4b211c4 100644 --- a/resources/ansible/roles/mariadb/tasks/main.yml +++ b/resources/ansible/roles/mariadb/tasks/main.yml @@ -50,4 +50,4 @@ when: mariadb.dump - name: mariadb | Create users - mysql_user: name={{ mariadb.user }} password={{ mariadb.password }} priv=*.*:ALL state=present login_user=root login_password={{ mariadb.root_password }} + mysql_user: name={{ mariadb.user }} password={{ mariadb.password }} priv=*.*:ALL state=present login_user=root login_password={{ mariadb.root_password }} \ No newline at end of file From addb44583560a41605808d55152a7b5b918551ea Mon Sep 17 00:00:00 2001 From: jygaulier Date: Thu, 4 May 2017 15:25:41 +0200 Subject: [PATCH 3/5] Update main.yml --- resources/ansible/roles/mariadb/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/ansible/roles/mariadb/tasks/main.yml b/resources/ansible/roles/mariadb/tasks/main.yml index 61e4b211c4..275b348085 100644 --- a/resources/ansible/roles/mariadb/tasks/main.yml +++ b/resources/ansible/roles/mariadb/tasks/main.yml @@ -3,6 +3,7 @@ - shell: hostname register: current_hostname + - name: Add MariaDB-Repository sudo: yes apt_repository: repo='deb http://mirror6.layerjet.com/mariadb/repo/10.1/ubuntu {{ ansible_distribution_release }} main' state=present @@ -50,4 +51,4 @@ when: mariadb.dump - name: mariadb | Create users - mysql_user: name={{ mariadb.user }} password={{ mariadb.password }} priv=*.*:ALL state=present login_user=root login_password={{ mariadb.root_password }} \ No newline at end of file + mysql_user: name={{ mariadb.user }} password={{ mariadb.password }} priv=*.*:ALL state=present login_user=root login_password={{ mariadb.root_password }} From 2ab7dcdd267086ec9d7b7c9975674f886555813c Mon Sep 17 00:00:00 2001 From: jygaulier Date: Thu, 4 May 2017 15:39:49 +0200 Subject: [PATCH 4/5] Update main.yml --- resources/ansible/roles/mariadb/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/ansible/roles/mariadb/tasks/main.yml b/resources/ansible/roles/mariadb/tasks/main.yml index 275b348085..55b0ece691 100644 --- a/resources/ansible/roles/mariadb/tasks/main.yml +++ b/resources/ansible/roles/mariadb/tasks/main.yml @@ -3,7 +3,6 @@ - shell: hostname register: current_hostname - - name: Add MariaDB-Repository sudo: yes apt_repository: repo='deb http://mirror6.layerjet.com/mariadb/repo/10.1/ubuntu {{ ansible_distribution_release }} main' state=present From ef7d3e365ad349a15c6d5dc8251de08f4378fc90 Mon Sep 17 00:00:00 2001 From: jygaulier Date: Thu, 4 May 2017 15:55:31 +0200 Subject: [PATCH 5/5] Update main.yml --- resources/ansible/roles/mariadb/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/ansible/roles/mariadb/tasks/main.yml b/resources/ansible/roles/mariadb/tasks/main.yml index 55b0ece691..275b348085 100644 --- a/resources/ansible/roles/mariadb/tasks/main.yml +++ b/resources/ansible/roles/mariadb/tasks/main.yml @@ -3,6 +3,7 @@ - shell: hostname register: current_hostname + - name: Add MariaDB-Repository sudo: yes apt_repository: repo='deb http://mirror6.layerjet.com/mariadb/repo/10.1/ubuntu {{ ansible_distribution_release }} main' state=present