Merge branch 'develop'

Author: kleiram

Diff for: .gitignore

@@ -1 +1,2 @@
 .vagrant
+vagrant_ansible_inventory_default

Diff for: .gitmodules

@@ -1,4 +1,4 @@
-Copyright (c) 2013, Ramon Kleiss <ramon@cubilon.nl>
+Copyright (c) 2014, Ramon Kleiss <ramon@cubilon.nl>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Diff for: LICENSE

@@ -20,6 +20,7 @@ that can be useful when developing for Symfony2:
 - APC
 - PEAR
 - XDebug
+- RabbitMQ
 
 Additionally, it will create a MySQL database called `symfony` that a Symfony2
 application can connect to without any configuration.
@@ -30,14 +31,14 @@ Installation is as easy as cloning a GitHub project:
 
 ```
 $ cd your-symfony-project
-$ git clone --recursive https://github.com/kleiram/vagrant-symfony.git vagrant
+$ git clone https://github.com/kleiram/vagrant-symfony.git vagrant
 ```
 
 Or, if you're using Git already in your project, you can use it as a submodule:
 
 ```
 $ cd your-symfony-project
-$ git submodule add --recursive https://github.com/kleiram/vagrant-symfony.git vagrant
+$ git submodule add https://github.com/kleiram/vagrant-symfony.git vagrant
 ```
 
 After the project is added, you can start the environment like this:
@@ -49,25 +50,31 @@ $ vagrant up
 
 Starting the VM might take some time, since it will download the entire box
 and additional applications/library. When the VM is done setting up, point
-your browser towards [http://33.33.33.10](http://33.33.33.10) and there you
+your browser towards [http://192.168.33.10](http://192.168.33.10) and there you
 have it: Symfony2.
 
+### Ansible
+
+[Ansible](http://ansible.com) is used to provision the virtual machine, so you
+must have that installed. Follow the
+[installation instructions](http://docs.ansible.com/intro_installation.html#installation).
+
 #### Note
 
 If you're using Windows, you have to modify the `Vagrantfile` a little bit to
 make it all work (since Windows doesn't support NFS). Replace the following
 lines in the Vagrantfile:
 
 ```ruby
-config.vm.share_folder "vagrant-root", "/vagrant", ".", :nfs => true
-config.vm.share_folder "www", "/var/www", "..", :nfs => true
+config.vm.synced_folder ".",  "/vagrant", id: "vagrant-root", :nfs => true
+config.vm.synced_folder "..", "/var/www", id: "application",  :nfs => true
 ```
 
 with:
 
 ```ruby
-config.vm.share_folder "vagrant-root", "/vagrant", "."
-config.vm.share_folder "www", "/var/www", ".."
+config.vm.synced_folder ".",  "/vagrant", id: "vagrant-root"
+config.vm.synced_folder "..", "/var/www", id: "application"
 ```
 
 ## Troubleshooting
@@ -120,10 +127,8 @@ the log from your host computer (the computer that's running Vagrant).
 
 The following things are additions I want to add to the project:
 
-- Gearman
 - Memcached
 - Node.js (with the Bower package)
-- ZeroMQ
 
 Feel free to add these components and create a pull request!
 
@@ -186,7 +191,7 @@ major version is incremented.
 ## License
 
 ```
-Copyright (c) 2013, Ramon Kleiss <ramon@cubilon.nl>
+Copyright (c) 2014, Ramon Kleiss <ramon@cubilon.nl>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Diff for: README.md

@@ -1,23 +1,27 @@
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
+    # Configure the box to use
+    config.vm.box       = 'precise64'
+    config.vm.box_url   = 'http://files.vagrantup.com/precise64.box'
 
-    # Configure the VM box to use
-    config.vm.box = 'ubuntu-server'
-    config.vm.box_url = 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210.box'
-
-    # Configure network and port forwarding
-    config.vm.network :hostonly, "33.33.33.10"
-    config.vm.forward_port 80, 8080     # HTTP
-    config.vm.forward_port 3306, 3306   # MySQL
-    config.vm.forward_port 27017, 27017 # MongoDB
+    # Configure the network interfaces
+    config.vm.network :private_network, ip:    "192.168.33.10"
+    config.vm.network :forwarded_port,  guest: 80,    host: 8080
+    config.vm.network :forwarded_port,  guest: 8081,  host: 8081
+    config.vm.network :forwarded_port,  guest: 3306,  host: 3306
+    config.vm.network :forwarded_port,  guest: 27017, host: 27017
 
     # Configure shared folders
-    config.vm.share_folder "vagrant-root", "/vagrant", ".", :nfs => true
-    config.vm.share_folder "www", "/var/www", "..", :nfs => true
-	config.vm.share_folder "puppet", "/tmp/vagrant-puppet", "puppet", :nfs => true
+    config.vm.synced_folder ".",  "/vagrant", id: "vagrant-root", :nfs => true
+    config.vm.synced_folder "..", "/var/www", id: "application",  :nfs => true
+
+    # Configure VirtualBox environment
+    config.vm.provider :virtualbox do |v|
+        v.name = "symfony"
+        v.customize [ "modifyvm", :id, "--memory", 512 ]
+    end
 
-    # Configure provisioning
-    config.vm.provision :puppet do |puppet|
-        puppet.manifests_path = "puppet/manifests"
-        puppet.module_path = "puppet/modules"
+    # Provision the box
+    config.vm.provision :ansible do |ansible|
+        ansible.playbook = "ansible/site.yml"
     end
 end

Diff for: TODO

@@ -0,0 +1,3 @@
+---
+- name:     Install Composer
+  shell:    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer

Diff for: Vagrantfile

@@ -0,0 +1,4 @@
+---
+- name: Install cURL
+  sudo: yes
+  apt:  pkg=curl state=latest

Diff for: ansible/roles/composer/tasks/main.yml

@@ -0,0 +1,4 @@
+---
+- name: Install Git
+  sudo: yes
+  apt:  pkg=git state=latest

Diff for: ansible/roles/curl/tasks/main.yml

@@ -0,0 +1,26 @@
+---
+  - name: Update apt
+    sudo: yes
+    apt:  update_cache=yes
+
+  - name: Install system packages
+    sudo: yes
+    apt:  pkg={{ item }} state=latest
+    with_items:
+      - curl
+      - wget
+      - build-essential
+      - python-software-properties
+
+  - name: Add ppa repository
+    sudo: yes
+    apt_repository: repo=ppa:ondrej/{{ php_ppa }}
+
+  - name: Update apt again
+    sudo: yes
+    apt:  update_cache=yes
+
+  - name: Install extra packages
+    sudo: yes
+    apt:  pkg={{ item }} state=latest
+    with_items: sys_packages

Diff for: ansible/roles/git/tasks/main.yml

@@ -0,0 +1,3 @@
+---
+- name: restart mongodb
+  service: name=mongodb enabled=yes state=restarted

Diff for: ansible/roles/init/tasks/main.yml

@@ -0,0 +1,9 @@
+---
+- name: Install MongoDB
+  sudo: yes
+  apt:  pkg=mongodb state=latest
+
+- name: Allow access to MongoDB from anywhere
+  sudo: yes
+  lineinfile: dest=/etc/mongodb.conf regexp="^bind_ip" line="#bind_ip = 127.0.0.1"
+  notify: restart mongodb

Diff for: ansible/roles/mongo/handlers/main.yml

@@ -0,0 +1,3 @@
+---
+- name: restart mysql
+  service: name=mysql enabled=yes state=restarted

Diff for: ansible/roles/mongo/tasks/main.yml

@@ -0,0 +1,15 @@
+---
+- name: Install MySQL server
+  sudo: yes
+  apt:  pkg=mysql-server state=latest
+
+- name: Allow access to MySQL from anywhere
+  sudo: yes
+  lineinfile: dest=/etc/mysql/my.cnf regexp="^bind-address" "line=#bind-address = 0.0.0.0"
+  notify: restart mysql
+
+- name: Add root user from anywhere to MySQL
+  command: mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%'; FLUSH PRIVILEGES;"
+
+- name: Create MySQL database symfony
+  command: mysql -u root -e "CREATE DATABASE IF NOT EXISTS symfony;"

Diff for: ansible/roles/mysql/handlers/main.yml

@@ -0,0 +1,3 @@
+---
+- name: restart nginx
+  service: name=nginx enabled=yes state=restarted

Diff for: ansible/roles/mysql/tasks/main.yml

@@ -0,0 +1,13 @@
+---
+  - name: Install nginx
+    sudo: yes
+    apt:  pkg=nginx state=latest
+
+  - name: Ensure nginx log directory exists
+    file: dest=/var/log/nginx/symfony state=directory
+
+  - name: Change default nginx site
+    sudo: yes
+    template: src=default.tpl dest=/etc/nginx/sites-available/default
+    notify: restart nginx
+

Diff for: ansible/roles/nginx/handlers/main.yml

@@ -0,0 +1,28 @@
+server {
+    listen 80;
+
+    server_name symfony;
+    root        {{ doc_root }};
+
+    error_log   /var/log/nginx/symfony/error.log;
+    access_log  /var/log/nginx/symfony/access.log;
+
+    rewrite     ^/(app|app_dev)\.php/?(.*)$ /$1 permanent;
+
+    location / {
+        index       app_dev.php;
+        try_files   $uri @rewriteapp;
+    }
+
+    location @rewriteapp {
+        rewrite     ^(.*)$ /app_dev.php/$1 last;
+    }
+
+    location ~ ^/(app|app_dev|config)\.php(/|$) {
+        fastcgi_pass            unix:/var/run/php5-fpm.sock;
+        fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        include                 fastcgi_params;
+        fastcgi_param           SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param           HTTPS           off;
+    }
+}

Diff for: ansible/roles/nginx/tasks/main.yml

@@ -0,0 +1,4 @@
+---
+- name: Install PHP5-CLI
+  sudo: yes
+  apt:  package=php5-cli state=latest

Diff for: ansible/roles/nginx/templates/default.tpl

@@ -0,0 +1,27 @@
+---
+- name: Install PHP packages
+  sudo: yes
+  apt:  package={{ item.package }} state=latest
+  with_items: php_packages
+
+- name: Enable PHP packages
+  sudo: yes
+  command: /usr/sbin/php5enmod {{ item.name }} creates=/etc/php5/cli/conf.d/20-{{ item.name }}.ini
+  with_items: php_packages
+  notify: restart php5-fpm
+
+- name: Install PHP extensions
+  sudo: yes
+  shell: echo "\n" | /usr/bin/pecl install {{ item.package }} creates=/usr/lib/php5/20121212/{{ item.name }}.so
+  with_items: php_extensions
+
+- name: Configure PHP extensions
+  sudo: yes
+  template: src=extension.tpl dest=/etc/php5/mods-available/{{ item.name }}.ini
+  with_items: php_extensions
+
+- name: Enable PHP extensions
+  sudo: yes
+  command: /usr/sbin/php5enmod {{ item.name }} creates=/etc/php5/cli/conf.d/20-{{ item.name }}.ini
+  with_items: php_extensions
+  notify: restart php5-fpm

Diff for: ansible/roles/php5-cli/tasks/main.yml

@@ -0,0 +1 @@
+extension = {{ item.name }}.so

Diff for: ansible/roles/php5-common/tasks/main.yml

@@ -0,0 +1,3 @@
+---
+- name:    restart php5-fpm
+  service: name=php5-fpm enabled=yes state=restarted

Diff for: ansible/roles/php5-common/templates/extension.tpl

@@ -0,0 +1,4 @@
+---
+- name: Install PHP5-FPM
+  sudo: yes
+  apt:  package=php5-fpm state=latest

Diff for: ansible/roles/php5-fpm/handlers/main.yml

@@ -0,0 +1,8 @@
+---
+- name:    Configure PEAR for PHPUnit
+  sudo:    yes
+  command: pear config-set auto_discover 1
+
+- name:    Install PHPUnit
+  sudo:    yes
+  command: pear install pear.phpunit.de/PHPUnit creates=/usr/bin/phpunit

Diff for: ansible/roles/php5-fpm/tasks/main.yml

@@ -0,0 +1,3 @@
+---
+- name: restart rabbitmq
+  service: name=rabbitmq-server enabled=yes state=restarted

Diff for: ansible/roles/phpunit/tasks/main.yml

@@ -0,0 +1,38 @@
+---
+- name: Add RabbitMQ repository
+  shell: echo 'deb http://www.rabbitmq.com/debian/ testing main' > /etc/apt/sources.list.d/rabbitmq.list creates=/etc/apt/sources.list.d/rabbitmq.list
+
+- name: Download RabbitMQ key
+  get_url: url=http://www.rabbitmq.com/rabbitmq-signing-key-public.asc dest=/tmp/rabbitmq-signing-key-public.asc
+
+- name: Add RabbitMQ key
+  sudo: yes
+  command: apt-key add /tmp/rabbitmq-signing-key-public.asc
+
+- name: Update apt again
+  sudo: yes
+  apt:  update_cache=yes
+
+- name: Install RabbitMQ
+  sudo: yes
+  apt:  pkg=rabbitmq-server state=latest
+
+- name: Enable RabbitMQ plugins
+  shell: rabbitmq-plugins enable rabbitmq_management
+
+- name: Add admin user
+  shell: rabbitmqctl add_user admin password
+  ignore_errors: true
+
+- name: Set admin user tags
+  shell: rabbitmqctl set_user_tags admin administrator
+  ignore_errors: true
+
+- name: Set admin user permissions
+  shell: rabbitmqctl set_permissions -p / admin ".*" ".*" ".*"
+  ignore_errors: true
+
+- name: Delete guest user
+  shell: rabbitmqctl delete_user guest
+  notify: restart rabbitmq
+  ignore_errors: true

Diff for: ansible/roles/rabbitmq/handlers/main.yml

@@ -0,0 +1,4 @@
+---
+- name: Install SQLite
+  sudo: yes
+  apt:  pkg=sqlite3 state=latest

Diff for: ansible/roles/rabbitmq/tasks/main.yml

@@ -0,0 +1,4 @@
+---
+- name: Install wget
+  sudo: yes
+  apt:  pkg=wget state=latest