Merge pull request #21 from e7d/develop

Neap Box 1.3.0

CHANGELOG.md

@@ -1,3 +1,22 @@
+## v1.3.0 (2016-10-31)
+* updated Debian Jessie to version 8.6
+* updated VirtualBox Guest additions to version 5.1.8
+* updated Lets Encrypt Certbot to version 0.9.3
+* updated PostgreSQL to version 9.6.1
+* updated MailCatcher to version 0.6.5
+* updated Redis to version 3.2.4
+* updated nginx to version 1.10.2
+* updated OpenSSL to version 1.0.2j
+* updated nginx-rtmp-module to version 1.1.10
+* updated PHP and PHP-FPM to version 7.0.12
+* updated NodeJS to version 6.9.1
+* updated NPM to version 3.10.9
+* updated Newman to version 3.2.0
+* updated FFmpeg to version 2.8.8
+* updated UnrealIRCd to version 4.0.7
+* added a "Neap" group attribution to the VirtualBox machine
+* fixed Vagrantfile configuration
+
 ## v1.2.13 (2016-09-23)
 * updated VirtualBox Guest additions to version 5.1.6
 * updated PostgreSQL to version 9.5.4
@@ -23,7 +42,7 @@
 * updated Xdebug to version 2.4.1
 * updated Composer to version 1.2.0
 * updated NodeJS to version 6.3.1
-* fixed ffmpeg repository (deb-multimedia) keyring
+* fixed FFmpeg repository (deb-multimedia) keyring
 * updated UnrealIRCd to version 4.0.5
 * updated Anope to version 2.0.4
 
@@ -87,7 +106,7 @@
 * updated PHP and PHP-FPM to version 7.0.6
 * updated Composer to version 1.0.3
 * updated NPM to version 3.8.7
-* updated ffmpeg to version 2.8.7
+* updated FFmpeg to version 2.8.7
 
 ## v1.2.5 (2016-04-28)
 * downgraded nginx to version 1.9.10 to ensure nginx-rtmp-module compatibility
@@ -114,7 +133,7 @@
 * updated NPM to version 3.8.2
 
 ## v1.2.2 (2016-03-15)
-* fixed ffmpeg setup
+* fixed FFmpeg setup
 * normalized Let's Encrypt setup
 * normalized folders structure
 * fixed erroneous phpredis setup
@@ -136,7 +155,7 @@
 ## v1.2.0 (2016-02-17)
 * updated nginx to version 1.9.11
 * updated PostgreSQL to version 9.5.1
-* updated ffmpegto version 2.8.6
+* updated FFmpeg to version 2.8.6
 * added MailCatcher, with version 0.6.4
 * fixed Let's Encrypt recipe
 * improved bootstrap:

README.md

@@ -11,7 +11,7 @@ This project aims to give you the necessary tools to build yourself the Neap Box
 
 ## About
 
-**Version:** 1.2.13  
+**Version:** 1.3.0  
 **Web:** Coming later, [box.neap.io](http://box.neap.io)  
 **Project Owner:** Michaël "[e7d](https://github.com/e7d)" Ferrand
 
@@ -52,24 +52,24 @@ Neap box uses Vagrant's [shell provisioner](https://docs.vagrantup.com/v2/provis
 
 Once Vagrant is done provisioning the VM, you will have a box containing:
 
-* [Debian](https://www.debian.org/) Jessie 8.5, as operating system, with:
-    * [VirtualBox](https://www.virtualbox.org/) Guest Additions 5.1.6
-* [Let's Encrypt Certbot](https://certbot.eff.org/) 0.8.1, as SSL certificate generator
+* [Debian](https://www.debian.org/) Jessie 8.6, as operating system, with:
+    * [VirtualBox](https://www.virtualbox.org/) Guest Additions 5.1.8
+* [Let's Encrypt Certbot](https://certbot.eff.org/) 0.9.3, as SSL certificate generator
 * [jq](https://stedolan.github.io/jq/) 1.5, as JSON processor
-* [PostgreSQL](http://www.postgresql.org/) 9.5.4, as database system
-* [Redis](http://redis.io/) 3.2.3, as data structure store
-* [MailCatcher](https://mailcatcher.me/) 0.6.4 as mail catching server
-* [nginx](http://nginx.org/) 1.10.1, as web server, with:
-    * [OpenSSL](https://www.openssl.org/) 1.0.2h, as SSL module
-    * [nginx-rtmp-module](https://github.com/arut/nginx-rtmp-module) 1.1.9, as streaming handler (RTMP, HLS and DASH protocols)
-* [PHP](http://php.net/) 7.0.11, as server-side scripting language, with:
-    * [PHP-FPM](http://php-fpm.org/) 7.0.11, as PHP process manager
-    * [Xdebug](http://xdebug.org/) 2.4.1, as debugger and profiler tool
+* [PostgreSQL](http://www.postgresql.org/) 9.6.1, as database system
+* [Redis](http://redis.io/) 3.2.4, as data structure store
+* [MailCatcher](https://mailcatcher.me/) 0.6.5 as mail catching server
+* [nginx](http://nginx.org/) 1.10.2, as web server, with:
+    * [OpenSSL](https://www.openssl.org/) 1.0.2j, as SSL module
+    * [nginx-rtmp-module](https://github.com/arut/nginx-rtmp-module) 1.1.10, as streaming handler (RTMP, HLS and DASH protocols)
+* [PHP](http://php.net/) 7.0.12, as server-side scripting language, with:
+    * [PHP-FPM](http://php-fpm.org/) 7.0.12, as PHP process manager
     * [PhpRedis](https://github.com/phpredis/phpredis) 3.0.0, as PHP extension for Redis
+    * [Xdebug](http://xdebug.org/) 2.4.1, as debugger and profiler tool
     * [Composer](https://getcomposer.org/) 1.2.1, as dependency manager
-* [NodeJS](https://nodejs.org/) 6.6.0, as JavaScript runtime
-    * [NPM](https://www.npmjs.com/) 3.10.8, as JavaScript package Manager
-    * [Newman](https://github.com/postmanlabs/newman) 3.1.1, as [Postman](http://getpostman.com/) collection runner
-* [FFmpeg](https://www.ffmpeg.org/) 2.8.7, as media converter
-* [UnrealIRCd](https://www.unrealircd.org/) 4.0.6, as IRC server daemon, with:
+* [NodeJS](https://nodejs.org/) 6.9.1, as JavaScript runtime
+    * [NPM](https://www.npmjs.com/) 3.10.9, as JavaScript package Manager
+    * [Newman](https://github.com/postmanlabs/newman) 3.2.0, as [Postman](http://getpostman.com/) collection runner
+* [FFmpeg](https://www.ffmpeg.org/) 2.8.8, as media converter
+* [UnrealIRCd](https://www.unrealircd.org/) 4.0.7, as IRC server daemon, with:
     * [Anope](https://www.anope.org/) 2.0.4, as IRC services daemon

VERSION

@@ -1 +1 @@
-1.2.13
+1.3.0

Vagrantfile

@@ -1,6 +1,6 @@
 Vagrant.configure(2) do |config|
     # Collect data about the host
-    case RbConfig::CONFIG['host_os']
+    case RbConfig::CONFIG["host_os"]
         when /cygwin|mswin|msys|mingw|bccwin|wince|emc|emx|windows/i
             # Windows
             cpus = `wmic cpu get NumberOfLogicalProcessors`.split("\n")[2].to_i
@@ -15,24 +15,28 @@ Vagrant.configure(2) do |config|
             cpus = 2
     end
 
-    config.vm.define 'Neap Box' do |node|
+    config.vm.define "Neap Box" do |node|
         # For a complete reference, please see the online documentation at
         # https://docs.vagrantup.com.
 
         # General configuration
-        node.vm.hostname = 'box.neap.dev'
-        node.vm.box = 'debian/contrib-jessie64'
-        node.vm.box_version = '= 8.5.2'
+        node.vm.hostname = "box.neap.dev"
+        node.vm.box = "debian/contrib-jessie64"
+        node.vm.box_version = ">= 8.6.2"
 
         # Synced folder configuration
-        node.vm.synced_folder '.', '/vagrant'
+        node.vm.synced_folder ".", "/vagrant"
 
         # VirtualBox provider
-        node.vm.provider 'virtualbox' do |provider|
+        node.vm.provider "virtualbox" do |vb|
             # System configuration
-            provider.name = 'Neap Box'
-            provider.cpus = cpus
-            provider.memory = '1024'
+            vb.name = "Neap Box"
+            vb.cpus = cpus
+            vb.memory = "1024"
+            vb.customize [
+                "modifyvm", :id,
+                "--groups", "/Neap",
+            ]
         end
 
         #  VirtualBox Guest update
@@ -41,16 +45,16 @@ Vagrant.configure(2) do |config|
         node.vbguest.no_remote = true
 
         # Provisioning script
-        node.vm.provision 'shell' do |s|
-            s.inline = '/vagrant/bootstrap.sh | tee /vagrant/bootstrap.log'
+        node.vm.provision "shell" do |s|
+            s.inline = "/vagrant/bootstrap.sh | tee /vagrant/bootstrap.log"
             s.keep_color = true
         end
     end
 end
 
 class DebianVbguest < VagrantVbguest::Installers::Debian
     def install(opts=nil, &block)
-        communicate.sudo('apt-get -y -q purge virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-x11', opts, &block)
+        communicate.sudo("apt-get -y -q purge virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-x11", opts, &block)
         @vb_uninstalled = true
         super
     end

bootstrap/build-nginx.sh

@@ -9,9 +9,9 @@ if [ 0 != $(id -u) ]; then
 	exit 1
 fi
 
-NGINX_VERSION=1.10.1 # http://nginx.org/en/download.html
-OPENSSL_VERSION=1.0.2h # https://openssl.org/source/
-NGINX_RTMP_VERSION=1.1.9 # https://github.com/arut/nginx-rtmp-module/releases
+NGINX_VERSION=1.10.2 # http://nginx.org/en/download.html
+OPENSSL_VERSION=1.0.2j # https://openssl.org/source/
+NGINX_RTMP_VERSION=1.1.10 # https://github.com/arut/nginx-rtmp-module/releases
 
 try
 (

bootstrap/build-redis.sh

@@ -9,7 +9,7 @@ if [ 0 != $(id -u) ]; then
 	exit 1
 fi
 
-REDIS_VERSION=3.2.3 # http://redis.io/download
+REDIS_VERSION=3.2.4 # http://redis.io/download
 
 try
 (

bootstrap/build-unreal.sh

@@ -9,7 +9,7 @@ if [ 0 != $(id -u) ]; then
 	exit 1
 fi
 
-UNREAL_VERSION=4.0.6 # https://www.unrealircd.org/download/4.0/
+UNREAL_VERSION=4.0.7 # https://www.unrealircd.org/download/4.0/
 
 try
 (

bootstrap/setup-postgresql.sh

@@ -19,8 +19,8 @@ try
     apt-get -y -q update
 
     echo "Install packages"
-    apt-get -y -q install postgresql-9.5 postgresql-client-9.5 postgresql-client-common postgresql-common \
-                          postgresql-contrib-9.5
+    apt-get -y -q install postgresql-9.6 postgresql-client-9.6 postgresql-client-common postgresql-common \
+                          postgresql-contrib-9.6
 )
 catch || {
     case $ex_code in

metadata.json

@@ -4,7 +4,7 @@
     "name": "e7d/neap-box",
     "versions": [
         {
-            "version": "1.2.13",
+            "version": "1.3.0",
             "providers": [{
                 "name": "virtualbox",
                 "url": "neap.box"