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

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

@@ -0,0 +1,2 @@
+- name: restart php-fpm
+  service: name=php5.6-fpm state=restarted

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

@@ -0,0 +1,3 @@
+---
+dependencies:
+  - { role: php }

playbooks/roles/nginx/handlers/main.yml

@@ -15,9 +15,14 @@
     - php5.6-intl
     - php5.6-cli
     - php5.6-mcrypt
+    - php5.6-mbstring
+    - php5.6-dom
 
 - name: Enable the MCrypt extension
   shell: phpenmod mcrypt
 
 - name: Install composer
-  shell: curl -sS https://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin --filename=composer
+  shell: curl -sS https://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin --filename=composer
+
+- name: Configure composer cache directory to avoid using slow NFS
+  shell: composer config --global cache-dir /dev/shm/composer/cache

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

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

playbooks/templates/nginx/nginx.conf.j2 renamed to playbooks/roles/nginx/templates/nginx.conf.j2

@@ -9,29 +9,31 @@
   git: repo=https://github.com/symfony/symfony-standard.git
        dest=/vagrant/symfony-standard
        update=no
+  become: true
+  become_user: "{{ www_user }}"
 
 - name: Copy across new parameters.yml
   template:
-    src=symfony/symfony_parameters.yml.j2
+    src=parameters.yml.j2
     dest=/vagrant/symfony-standard/app/config/parameters.yml
-
-- stat: path=/vagrant/symfony-standard/vendor
-  register: p
+  become: true
+  become_user: "{{ www_user }}"
 
 - name: Install Symfony2 project dependencies
-  shell: cd /vagrant/symfony-standard && composer install
-  when: p.stat.isdir is not defined
+  shell: cd /vagrant/symfony-standard && COMPOSER_PROCESS_TIMEOUT=900 composer install
+  become: true
+  become_user: "{{ www_user }}"
 
 - name: Copy across new php-fpm pool config for symfony
   template:
-    src=php-fpm/symfony.conf.j2
+    src=php-fpm.conf.j2
     dest=/etc/php/5.6/fpm/pool.d/symfony.conf
   notify:
     - restart php-fpm
 
 - name: Copy across new virtual host for symfony
   template:
-    src=nginx/symfony.conf.j2
+    src=nginx.conf.j2
     dest=/etc/nginx/sites-available/symfony.conf
   notify:
     - restart nginx

playbooks/tasks/php-devtools.yml renamed to playbooks/roles/php-devtools/tasks/main.yml

@@ -5,20 +5,15 @@
     document_root: /vagrant
     www_user: vagrant
     www_group: vagrant
-  handlers:
-    - name: restart nginx
-      service: name=nginx state=restarted
-    - name: restart php-fpm
-      service: name=php5.6-fpm state=restarted
   pre_tasks:
     - name: update apt cache
-      apt: update_cache=yes
-  tasks:
-    - include: tasks/base.yml
-    - include: tasks/nginx.yml
-    - include: tasks/mysql.yml
-    - include: tasks/php.yml
-    - include: tasks/php-devtools.yml
-    - include: tasks/php-fpm.yml
-    - include: tasks/symfony-standard.yml
-    - include: tasks/laravel-quickstart.yml
+      apt: update_cache=yes cache_valid_time=3600
+  roles:
+    - base
+    - nginx
+    - mysql
+    - php
+    - php-devtools
+    - php-fpm
+    - symfony-standard
+    - laravel-quickstart