Transfer ansible playbooks to roles, closes #30

Author: dirkaholic

Vagrantfile

@@ -10,7 +10,8 @@ Vagrant.configure(2) do |config|
   # See https://github.com/mitchellh/vagrant/issues/5005
   config.ssh.insert_key = false
 
-  config.vm.provision "ansible" do |ansible|
+  # Run Ansible from the Vagrant VM
+  config.vm.provision "ansible_local" do |ansible|
     ansible.verbose = "vv"
     ansible.playbook = "playbooks/vagrant.yml"
   end

playbooks/tasks/base.yml renamed to playbooks/roles/base/tasks/main.yml

@@ -3,4 +3,6 @@
   with_items:
     - curl
     - git
-    - python-mysqldb
+    - python-mysqldb
+    - zip
+    - unzip

playbooks/roles/laravel-quickstart/meta/main.yml

@@ -0,0 +1,6 @@
+---
+dependencies:
+  - { role: base }
+  - { role: mysql }
+  - { role: php-fpm }
+  - { role: nginx }

playbooks/tasks/laravel-quickstart.yml renamed to playbooks/roles/laravel-quickstart/tasks/main.yml

@@ -9,35 +9,41 @@
   git: repo=https://github.com/laravel/quickstart-basic
        dest=/vagrant/laravel-quickstart
        update=no
+  become: true
+  become_user: "{{ www_user }}"
 
 - name: Copy across new .env file
   template:
-    src=laravel/.env.j2
+    src=.env.j2
     dest=/vagrant/laravel-quickstart/.env
-
-- stat: path=/vagrant/laravel-quickstart/vendor
-  register: p
+  become: true
+  become_user: "{{ www_user }}"
 
 - name: Install Laravel project dependencies
-  shell: cd /vagrant/laravel-quickstart && composer install
-  when: p.stat.isdir is not defined
+  shell: cd /vagrant/laravel-quickstart && COMPOSER_PROCESS_TIMEOUT=900 composer install
+  become: true
+  become_user: "{{ www_user }}"
 
 - name: Generate laravel key
   shell: cd /vagrant/laravel-quickstart && php artisan key:generate
+  become: true
+  become_user: "{{ www_user }}"
 
 - name: Execute migrations for the quickstart example
   shell: cd /vagrant/laravel-quickstart && php artisan migrate
+  become: true
+  become_user: "{{ www_user }}"
 
 - name: Copy across new php-fpm pool config for laravel
   template:
-    src=php-fpm/laravel.conf.j2
+    src=php-fpm.conf.j2
     dest=/etc/php/5.6/fpm/pool.d/laravel.conf
   notify:
     - restart php-fpm
 
 - name: Copy across new virtual host for laravel
   template:
-    src=nginx/laravel.conf.j2
+    src=nginx.conf.j2
     dest=/etc/nginx/sites-available/laravel.conf
   notify:
     - restart nginx

playbooks/templates/laravel/.env.j2 renamed to playbooks/roles/laravel-quickstart/templates/.env.j2

@@ -0,0 +1,2 @@
+- name: restart nginx
+  service: name=nginx state=restarted

playbooks/templates/nginx/laravel.conf.j2 renamed to playbooks/roles/laravel-quickstart/templates/nginx.conf.j2

@@ -4,7 +4,7 @@
 
 - name: Copy across new nginx config
   template:
-    src=nginx/nginx.conf.j2
+    src=nginx.conf.j2
     dest=/etc/nginx/nginx.conf
   notify:
     - restart nginx