From e2b6bf0c84922b63c4dc911158d066281b434124 Mon Sep 17 00:00:00 2001 From: Eugene Manuilov Date: Wed, 7 Dec 2016 00:17:12 +0200 Subject: [PATCH 1/3] Updated version --- README.md | 2 +- www/default/app/views/layouts/index.phtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4a3d7e4..0174b44 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Phalcon VM (2.0-beta3) +# Phalcon VM (2.0-beta4) Phalcon VM is an open source [Vagrant](https://www.vagrantup.com/) configuration which contains wide range of tools required in modern web development. Like a Swiss Army Knife, Phalcon VM allows you to easily activate and use tools required for you project. diff --git a/www/default/app/views/layouts/index.phtml b/www/default/app/views/layouts/index.phtml index 4e53951..2482a53 100644 --- a/www/default/app/views/layouts/index.phtml +++ b/www/default/app/views/layouts/index.phtml @@ -2,7 +2,7 @@ From cdbf54afac6eea5cbbb04986ee54203ef0dfcfd6 Mon Sep 17 00:00:00 2001 From: Eugene Manuilov Date: Wed, 7 Dec 2016 00:18:56 +0200 Subject: [PATCH 2/3] Added information about varnish to the readme file --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0174b44..95266a0 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,13 @@ The primary goal of this project is to provide an approachable development envir After initial provision of your vagrant machine, you will have a fresh Ubuntu 16.04 instance with initial applications set required for very basic development. It includes Nginx server, PHP7 and its extensions (including Phalcon 3.x), Zephir, Composer (with Phalcon Dev Tools installed globally) and a few more. It will also contain a default site which will allow you to configure your environment as you want. -The default site will allow you to activate and configure MySQL, PostgreSQL or MongoDb databases (along with phpMyAdmin and phpPgAdmin tools), Redis and/or Memcached caching systems (along with phpMemcachedAdmin tool), Gearman and/or RabbitMQ jobs servers, Elasticsearch and/or Sphinxsearch search engines. +The default site will allow you to activate and configure Varnish cache, MySQL, PostgreSQL or MongoDb databases (along with phpMyAdmin and phpPgAdmin tools), Redis and/or Memcached caching systems (along with phpMemcachedAdmin tool), Gearman and/or RabbitMQ jobs servers, Elasticsearch and/or Sphinxsearch search engines. Here is full list of what is and can be installed: 1. [Ubuntu](http://www.ubuntu.com/) 16.04 LTS (Xenial Xerus) 1. [nginx](http://nginx.org/) (mainline version) +1. [Varnish](http://varnish-cache.org/) 4.x 1. [Phalcon PHP](https://phalconphp.com/) 3.x 1. [Phalcon Dev Tools](https://docs.phalconphp.com/en/latest/reference/tools.html) 3.x 1. [Zephir](http://zephir-lang.com/) 0.9.x From 10fcb56b4a5555d6bc44e0ca36f4bc7011a70a03 Mon Sep 17 00:00:00 2001 From: Eugene Manuilov Date: Thu, 22 Dec 2016 12:04:48 +0200 Subject: [PATCH 3/3] Updated version to 2.0 --- README.md | 2 +- provision/puppet/modules/phalconvm/manifests/init.pp | 2 +- www/default/app/views/layouts/index.phtml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 95266a0..343caf2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Phalcon VM (2.0-beta4) +# Phalcon VM 2.0 Phalcon VM is an open source [Vagrant](https://www.vagrantup.com/) configuration which contains wide range of tools required in modern web development. Like a Swiss Army Knife, Phalcon VM allows you to easily activate and use tools required for you project. diff --git a/provision/puppet/modules/phalconvm/manifests/init.pp b/provision/puppet/modules/phalconvm/manifests/init.pp index 5024ae8..d80ce1f 100644 --- a/provision/puppet/modules/phalconvm/manifests/init.pp +++ b/provision/puppet/modules/phalconvm/manifests/init.pp @@ -11,7 +11,7 @@ 'imagemagick', 'subversion', 'git', 'zip', 'unzip', 'ngrep', 'curl', 'make', 'autoconf', 'automake', 'build-essential', 'libxslt1-dev', 're2c', 'libxml2-dev', 'libmcrypt-dev', 'vim', 'colordiff', 'gcc', 'libpcre3-dev', - 'dos2unix', 'ntp', 'gettext', 'libyaml-dev', 'ack-grep', 'g++', + 'dos2unix', 'ntp', 'gettext', 'libyaml-dev', 'ack-grep', 'g++', 'ruby', 'rubygems-integration', ] package { $packages: ensure => 'installed' } diff --git a/www/default/app/views/layouts/index.phtml b/www/default/app/views/layouts/index.phtml index 2482a53..0e56d57 100644 --- a/www/default/app/views/layouts/index.phtml +++ b/www/default/app/views/layouts/index.phtml @@ -2,7 +2,7 @@