From 57e8aa59fa1b8ccf01f240dd70fc4ae83438bc95 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 22 Jan 2019 21:04:37 +0000
Subject: [PATCH] Use variables

---
 ansible/deploying/1-basic/main.yml | 9 ++++++---
 ansible/provisioning/vars/vars.yml | 2 +-
 ansible/vars/vars.yml              | 3 +++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ansible/deploying/1-basic/main.yml b/ansible/deploying/1-basic/main.yml
index 421f38d..f6052c0 100644
--- a/ansible/deploying/1-basic/main.yml
+++ b/ansible/deploying/1-basic/main.yml
@@ -2,18 +2,21 @@
 - hosts: dransible
   become: true
 
+  vars_files:
+    - ../../vars/vars.yml
+
   tasks:
     - name: Creating project directory
       file:
-        path: /var/www/app
+        path: "{{ app_project_root }}"
         state: directory
 
     - name: Uploading application
       synchronize:
         src: ../../../../
-        dest: /var/www/app
+        dest: "{{ app_project_root }}"
 
     - name: Installing Composer dependencies
       composer:
         command: install
-        working_dir: /var/www/app
+        working_dir: "{{ app_project_root }}"
diff --git a/ansible/provisioning/vars/vars.yml b/ansible/provisioning/vars/vars.yml
index d06ecb4..b4c59c9 100644
--- a/ansible/provisioning/vars/vars.yml
+++ b/ansible/provisioning/vars/vars.yml
@@ -1,7 +1,7 @@
 ---
 apache_vhosts:
   - servername: dransible
-    documentroot: "/var/www/app/web"
+    documentroot: "{{ app_project_docroot }}"
 
 php_packages:
   - libapache2-mod-php{{ php_default_version_debian }}
diff --git a/ansible/vars/vars.yml b/ansible/vars/vars.yml
index 21de471..2a2dd2d 100644
--- a/ansible/vars/vars.yml
+++ b/ansible/vars/vars.yml
@@ -1,4 +1,7 @@
 ---
+app_project_root: /var/www/app
+app_project_docroot: "{{ app_project_root }}/web"
+
 app_db_name: "{{ vault_app_db_name }}"
 app_db_user: "{{ vault_app_db_user }}"
 app_db_password: "{{ vault_app_db_password }}"