Re-structure ansible files

Vagrantfile

@@ -16,7 +16,7 @@ Vagrant.configure("2") do |config|
 
   config.vm.provision "ansible" do |ansible|
     ansible.compatibility_mode = "2.0"
-    ansible.playbook = "ansible/provisioning/main.yml"
+    ansible.playbook = "ansible/provision.yml"
     ansible.inventory_path = "ansible/hosts.ini"
     ansible.become = true
     ansible.ask_vault_pass = true

ansible/deploy.yml

@@ -3,7 +3,7 @@
   become: true
 
   vars_files:
-    - ../../vars/vars.yml
+    - vars/vars.yml
 
   tasks:
     - name: Creating project directory
@@ -13,7 +13,7 @@
 
     - name: Uploading application
       synchronize:
-        src: ../../../../
+        src: ../../
         dest: "{{ app_project_root }}"
 
     - name: Installing Composer dependencies

ansible/provision.yml

@@ -10,8 +10,7 @@
     - geerlingguy.composer
 
   vars_files:
-    - ../vars/vault.yml
-    - ../vars/vars.yml
+    - vars/vault.yml
     - vars/vars.yml
 
   tasks:

ansible/provisioning/vars/vars.yml

@@ -1,21 +0,0 @@
----
-apache_vhosts:
-  - servername: dransible
-    documentroot: "{{ app_project_docroot }}"
-
-php_packages:
-  - libapache2-mod-php{{ php_default_version_debian }}
-  - libpcre3-dev
-  - php-apcu
-  - php-sqlite3
-  - php{{ php_default_version_debian }}-cli
-  - php{{ php_default_version_debian }}-common
-  - php{{ php_default_version_debian }}-curl
-  - php{{ php_default_version_debian }}-dev
-  - php{{ php_default_version_debian }}-fpm
-  - php{{ php_default_version_debian }}-gd
-  - php{{ php_default_version_debian }}-imap
-  - php{{ php_default_version_debian }}-json
-  - php{{ php_default_version_debian }}-mbstring
-  - php{{ php_default_version_debian }}-opcache
-  - php{{ php_default_version_debian }}-xml

ansible/vars/vars.yml

@@ -1,4 +1,25 @@
 ---
+apache_vhosts:
+  - servername: dransible
+    documentroot: "{{ app_project_docroot }}"
+
+php_packages:
+  - libapache2-mod-php{{ php_default_version_debian }}
+  - libpcre3-dev
+  - php-apcu
+  - php-sqlite3
+  - php{{ php_default_version_debian }}-cli
+  - php{{ php_default_version_debian }}-common
+  - php{{ php_default_version_debian }}-curl
+  - php{{ php_default_version_debian }}-dev
+  - php{{ php_default_version_debian }}-fpm
+  - php{{ php_default_version_debian }}-gd
+  - php{{ php_default_version_debian }}-imap
+  - php{{ php_default_version_debian }}-json
+  - php{{ php_default_version_debian }}-mbstring
+  - php{{ php_default_version_debian }}-opcache
+  - php{{ php_default_version_debian }}-xml
+
 app_project_root: /var/www/app
 app_project_docroot: "{{ app_project_root }}/web"