Merge pull request #5 from eugene-manuilov/release/2.0-beta3

eugene-manuilov · web-flow · commit d76be8b5e974 · 2016-12-07T00:14:26.000+02:00
Release 2.0-beta3
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Phalcon VM (2.0-beta2)
+# Phalcon VM (2.0-beta3)
 
 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/Vagrantfile b/Vagrantfile
@@ -14,10 +14,10 @@ end
 require 'json'
 
 class ::Hash
-    def deep_merge(second)
-        merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
-        self.merge(second, &merger)
-    end
+	def deep_merge(second)
+		merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+		self.merge(second, &merger)
+	end
 end
 
 vagrant_dir = File.expand_path(File.dirname(__FILE__))
@@ -38,19 +38,19 @@ Vagrant.configure(2) do |config|
 	config.ssh.forward_agent = true
 
 	config.vm.network "private_network", ip: "192.168.50.99"
-#	if settings['varnish']['enabled'] === true
-#		config.vm.network "forwarded_port", guest: settings['varnish']['port'], host: settings['varnish']['port']
-#	end
-	if settings['mysql']['enabled'] === true
+	if settings['varnish']['enabled'] === true
+		config.vm.network "forwarded_port", guest: settings['varnish']['port'], host: settings['varnish']['port']
+	end
+	if settings['mysql']['enabled'] === true and settings['mysql']['forward_port'] === true
 		config.vm.network "forwarded_port", guest: settings['mysql']['port'], host: settings['mysql']['port']
 	end
-	if settings['redis']['enabled'] === true
+	if settings['redis']['enabled'] === true and settings['redis']['forward_port'] === true
 		config.vm.network "forwarded_port", guest: settings['redis']['port'], host: settings['redis']['port']
 	end
-	if settings['memcached']['enabled'] === true
+	if settings['memcached']['enabled'] === true and settings['memcached']['forward_port'] === true
 		config.vm.network "forwarded_port", guest: settings['memcached']['port'], host: settings['memcached']['port']
 	end
-	if settings['elasticsearch']['enabled'] === true
+	if settings['elasticsearch']['enabled'] === true and settings['elasticsearch']['forward_port'] === true
 		config.vm.network "forwarded_port", guest: settings['elasticsearch']['port'], host: settings['elasticsearch']['port']
 	end
 
@@ -71,11 +71,11 @@ Vagrant.configure(2) do |config|
 	config.vm.synced_folder "www/", "/srv/www/", :owner => "www-data", :mount_options => [ "dmode=775", "fmode=774" ]
 
 	config.vm.synced_folders.each do |id, options|
-        # Make sure we use Samba for file mounts on Windows
-        if ! options[:type] && Vagrant::Util::Platform.windows?
-            options[:type] = "smb"
-        end
-    end
+		# Make sure we use Samba for file mounts on Windows
+		if ! options[:type] && Vagrant::Util::Platform.windows?
+			options[:type] = "smb"
+		end
+	end
 
 	if defined?(VagrantPlugins::HostsUpdater)
 		hosts = settings['sites'].map do |site|
diff --git a/provision/puppet/modules.pp b/provision/puppet/modules.pp
@@ -40,9 +40,3 @@
 		'redis' => '1.2.3',
 	}
 }
-
-phalconvm::utils::puppet_modules { 'maxchk':
-	modules => {
-		'varnish' => '1.0.0',
-	}
-}
diff --git a/provision/puppet/modules/phalconvm/manifests/elasticsearch.pp b/provision/puppet/modules/phalconvm/manifests/elasticsearch.pp
@@ -1,7 +1,8 @@
 class phalconvm::elasticsearch(
-	$enabled = false,
-	$port    = '9200',
-#	$xpack   = false,
+	$enabled      = false,
+	$port         = '9200',
+	$forward_port = false,
+#	$xpack        = false,
 ) {
 	if $enabled == true {
 		class { 'elasticsearch':
diff --git a/provision/puppet/modules/phalconvm/manifests/init.pp b/provision/puppet/modules/phalconvm/manifests/init.pp
@@ -34,7 +34,7 @@
 
 	# services
 	class { 'phalconvm::nginx':                       * => $settings[nginx] }
-#	class { 'phalconvm::varnish':                     * => $settings[varnish] }
+	class { 'phalconvm::varnish':                     * => $settings[varnish] }
 	class { 'phalconvm::mysql':                       * => $settings[mysql] }
 	class { 'phalconvm::mysql::phpmyadmin':           * => $settings[phpMyAdmin] }
 	class { 'phalconvm::postgres':                    * => $settings[postgres] }
diff --git a/provision/puppet/modules/phalconvm/manifests/memcached.pp b/provision/puppet/modules/phalconvm/manifests/memcached.pp
@@ -1,7 +1,8 @@
 class phalconvm::memcached(
-	$enabled = false,
-	$max_memory = 64,
-	$port = 11211
+	$enabled      = false,
+	$max_memory   = 64,
+	$port         = 11211,
+	$forward_port = false,
 ) {
 	if $enabled == true {
 		class { 'memcached':
diff --git a/provision/puppet/modules/phalconvm/manifests/mysql.pp b/provision/puppet/modules/phalconvm/manifests/mysql.pp
@@ -2,6 +2,7 @@
 	$enabled                       = false,
 	$password                      = 'root',
 	$port                          = '3306',
+	$forward_port                  = false,
 	$general_log                   = false,
 	$slow_query_log                = true,
 	$log_queries_not_using_indexes = true,
diff --git a/provision/puppet/modules/phalconvm/manifests/mysql/phpmyadmin.pp b/provision/puppet/modules/phalconvm/manifests/mysql/phpmyadmin.pp
@@ -26,6 +26,9 @@
 			require => Archive['/tmp/phpmyadmin.tar.gz']
 		}
 
+		$fqdn_rand = fqdn_rand( 9999 )
+		$blowfish_secret = pw_hash( "${fqdn_rand}", 'SHA-512', 'JXXdi4G0Nl9xlh0emuoHZNSuPvZ0qcfGx1hF4cUfOkf3jS' )
+
 		file { '/srv/www/default/public/phpmyadmin/config.inc.php':
 			ensure  => 'present',
 			content => template( 'phalconvm/phpmyadmin/config.inc.php.erb' ),
diff --git a/provision/puppet/modules/phalconvm/manifests/php.pp b/provision/puppet/modules/phalconvm/manifests/php.pp
@@ -12,7 +12,7 @@
 	$track_errors                    = false,
 	$html_errors                     = true,
 	$xdebug_idekey                   = 'PVMDBG',
-    $xdebug_remote_port              = '9000',
+	$xdebug_remote_port              = '9000',
 	$xdebug_var_display_max_children = '-1',
 	$xdebug_var_display_max_data     = '-1',
 	$xdebug_var_display_max_depth    = '-1',
diff --git a/provision/puppet/modules/phalconvm/manifests/redis.pp b/provision/puppet/modules/phalconvm/manifests/redis.pp
@@ -1,6 +1,7 @@
 class phalconvm::redis(
 	$enabled                 = false,
 	$port                    = 6379,
+	$forward_port            = false,
 	$maxmemory               = 64,
 	$save_db_to_disk         = true,
 	$slowlog_log_slower_than = 100,
diff --git a/provision/puppet/modules/phalconvm/manifests/utils/puppet_modules.pp b/provision/puppet/modules/phalconvm/manifests/utils/puppet_modules.pp
@@ -1,8 +1,14 @@
 define phalconvm::utils::puppet_modules( $modules ) {
 	$modules.each |$module, $version| {
+		$command = $version ? {
+			false   => "puppet module install ${name}-${module}",
+			default => "puppet module install ${name}-${module} --version ${version}",
+		}
+
 		exec { "${name}-${module}":
-			command => "/opt/puppetlabs/bin/puppet module install ${name}-${module} --version ${version}",
+			command => $command,
 			creates => "/etc/puppetlabs/code/environments/production/modules/${module}/",
+			path    => '/opt/puppetlabs/bin',
 		}
 	}
 }
diff --git a/provision/puppet/modules/phalconvm/manifests/varnish.pp b/provision/puppet/modules/phalconvm/manifests/varnish.pp
@@ -1,28 +1,63 @@
 class phalconvm::varnish (
 	$enabled      = false,
-	$port         = '8080',
-	$storage_size = '64M',
+	$port         = '6081',
+	$storage_size = '64m',
+	$ttl          = '120',
 ) {
 	if $enabled == true {
-		class { 'varnish':
-#			varnish_listen_address => '0.0.0.0',
-			varnish_listen_port    => $port,
-			varnish_storage_size   => $storage_size,
-            add_repo               => false,
+		package { 'varnish':
+			ensure => 'installed',
+		}
+
+		service { 'varnish':
+			ensure  => 'running',
+			require => Package['varnish'],
+		}
+
+		$varnish_service = {
+			'Service' => {
+				'ExecStart' => "/usr/sbin/varnishd -j unix,user=vcache -F -a :${port} -T localhost:6082 -f /etc/varnish/default.vcl -t ${ttl} -S /etc/varnish/secret -s malloc,${storage_size}",
+			},
+		}
+
+		create_ini_settings( $varnish_service, {
+			path    => '/lib/systemd/system/varnish.service',
+			require => Package['varnish'],
+			notify  => Exec['varnish-daemon-reload'],
+		} )
+
+		file { '/etc/varnish/default.vcl':
+			ensure  => 'present',
+			content => template( 'phalconvm/varnish/default.vcl.erb' ),
+			require => Package['varnish'],
+			notify  => Service['varnish'],
+		}
+
+		exec { 'varnish-daemon-reload':
+			command     => '/bin/systemctl daemon-reload',
+			refreshonly => true,
+			notify      => Service['varnish'],
 		}
 	} else {
 		service { 'varnish':
 			ensure => 'stopped',
 		}
 
+		exec { 'varnish-unmount':
+			command => 'umount /var/lib/varnish',
+			path    => '/bin:/usr/bin',
+			unless  => "test -n `mount | grep varnish`",
+		}
+
 		package { 'varnish':
 			ensure  => 'purged',
-			require => Service['varnish'],
+			require => [ Service['varnish'], Exec['varnish-unmount'] ],
 		}
 
 		exec { 'varnish-remove':
-			command     => '/usr/bin/apt-get autoremove --purge -y',
+			command     => 'apt-get autoremove --purge -y',
 			refreshonly => true,
+			path        => '/bin:/usr/bin',
 			subscribe   => Package['varnish'],
 		}
 	}
diff --git a/provision/puppet/modules/phalconvm/manifests/website.pp b/provision/puppet/modules/phalconvm/manifests/website.pp
@@ -15,8 +15,8 @@
 			www_root    => "/srv/www/${site[directory]}/htdocs/public",
 			index_files => ['index.php'],
 			try_files   => ['$uri', '$uri/', '/index.php?$args'],
-            access_log  => "/srv/log/nginx/${site[directory]}.access.log",
-            error_log   => "/srv/log/nginx/${site[directory]}.error.log",
+			access_log  => "/srv/log/nginx/${site[directory]}.access.log",
+			error_log   => "/srv/log/nginx/${site[directory]}.error.log",
 			locations   => {
 				"${site[label]}-php-loc" => {
 					ensure        => present,
@@ -34,14 +34,14 @@
 			exec { "${site[label]} Installation":
 				command => "phalcon project ${site[directory]} --directory=/tmp && mv /tmp/${site[directory]}/* /srv/www/${site[directory]}/htdocs",
 				creates => "/srv/www/${site[directory]}/htdocs/public/index.php",
-                path    => '/bin:/usr/bin',
+				path    => '/bin:/usr/bin',
 			}
 		} else {
 			vcsrepo { "/srv/www/${site[directory]}/htdocs":
 				ensure   => 'present',
 				provider => $site[provider],
 				source   => $site[repository],
-                require  => [Phalconvm::Utils::Known_host['github.com'], Phalconvm::Utils::Known_host['bitbucket.org']],
+				require  => [Phalconvm::Utils::Known_host['github.com'], Phalconvm::Utils::Known_host['bitbucket.org']],
 			}
 		}
 	}
diff --git a/provision/puppet/modules/phalconvm/templates/phpmyadmin/config.inc.php.erb b/provision/puppet/modules/phalconvm/templates/phpmyadmin/config.inc.php.erb
@@ -8,7 +8,7 @@
  * @see: https://docs.phpmyadmin.net/en/latest/config.html
  */
 
-$cfg['blowfish_secret'] = 'JXXdi-/4G) {#0Nl9xl&h0-em(uoH,ZN$}SuPvZ0q*. c%?fGx1hF4cUfOkf=3jS';
+$cfg['blowfish_secret'] = '<%= @blowfish_secret %>';
 
 $i = 1;
 
diff --git a/provision/puppet/modules/phalconvm/templates/varnish/default.vcl.erb b/provision/puppet/modules/phalconvm/templates/varnish/default.vcl.erb
@@ -0,0 +1,52 @@
+#
+# This is an example VCL file for Varnish.
+#
+# It does not do anything by default, delegating control to the
+# builtin VCL. The builtin VCL is called when there is no explicit
+# return statement.
+#
+# See the VCL chapters in the Users Guide at https://www.varnish-cache.org/docs/
+# and https://www.varnish-cache.org/trac/wiki/VCLExamples for more examples.
+
+# Marker to tell the VCL compiler that this VCL has been adapted to the
+# new 4.0 format.
+vcl 4.0;
+
+# Default backend definition. Set this to point to your content server.
+backend default {
+    .host = "127.0.0.1";
+    .port = "80";
+}
+
+sub vcl_recv {
+    # Happens before we check if we have this in cache already.
+    #
+    # Typically you clean up the request here, removing cookies you don't need,
+    # rewriting the request, etc.
+
+    # unset cookies for images, stylesheets and javascript files to be able to cache it
+    if (req.url ~ "\.(css|js|png|gif|jp(e)?g)") {
+        unset req.http.cookie;
+    }
+
+    # bypass audio and video files and not cache it
+    if (req.url ~ "\.(mp4|mp3|avi)") {
+        return (pass);
+    }
+
+    return (hash);
+}
+
+sub vcl_backend_response {
+    # Happens after we have read the response headers from the backend.
+    #
+    # Here you clean the response headers, removing silly Set-Cookie headers
+    # and other mistakes your backend does.
+}
+
+sub vcl_deliver {
+    # Happens when we have all the pieces we need, and are about to send the
+    # response to the client.
+    #
+    # You can do accounting or modifying the final object here.
+}
diff --git a/provision/startup.sh b/provision/startup.sh
@@ -7,6 +7,7 @@ restart() {
 }
 
 restart nginx
+restart varnish
 restart php7.0-fpm
 restart mysql
 restart postgresql
diff --git a/www/default/app/config/fields.yml b/www/default/app/config/fields.yml
@@ -104,14 +104,17 @@ php:
 varnish:
     Varnish Server:
         key: varnish
-        disabled: true
         fields:
             enabled:
                 type: switch
                 description: Defines whether Varnish should be activated on provision or disabled.
             port:
                 type: text
                 description: The port to listen on for TCP connections.
+            ttl:
+                type: text
+                label: TTL
+                description: The time in seconds after which cache will be expired.
             storage_size:
                 type: text
                 description: The malloc storage size for cache data.
@@ -129,6 +132,9 @@ mysql:
             port:
                 type: text
                 description: The port to listen on for TCP connections.
+            forward_port:
+                type: checkbox
+                description: Defines whether Vagrant should forward MySQL port or not.
     Logs:
         key: mysql
         fields:
@@ -213,6 +219,9 @@ redis:
             port:
                 type: text
                 description: The port to listen on for TCP connections.
+            forward_port:
+                type: checkbox
+                description: Defines whether Vagrant should forward Redis port or not.
             maxmemory:
                 label: Max Memory
                 type: text
@@ -240,6 +249,9 @@ memcached:
                 type: input
                 label: TCP port
                 description: The port to listen on for TCP connections.
+            forward_port:
+                type: checkbox
+                description: Defines whether Vagrant should forward Memcached port or not.
     phpMemcacheAdmin:
         key: phpMemcacheAdmin
         fields:
@@ -273,6 +285,9 @@ elasticsearch:
             port:
                 type: text
                 description: The port to listen on for TCP connections.
+            forward_port:
+                type: checkbox
+                description: Defines whether Vagrant should forward Elasticsearch port or not.
 #    Plugins:
 #        key: elasticsearch
 #        fields:
diff --git a/www/default/app/views/index/_list.phtml b/www/default/app/views/index/_list.phtml
diff --git a/www/default/app/views/index/index.phtml b/www/default/app/views/index/index.phtml
diff --git a/www/default/app/views/layouts/index.phtml b/www/default/app/views/layouts/index.phtml
diff --git a/www/default/data/defaults.json b/www/default/data/defaults.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Phalcon VM (2.0-beta2)`
	`1`	`+# Phalcon VM (2.0-beta3)`
`2`	`2`
`3`	`3`	`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.`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,3 @@`
`40`	`40`	`'redis' => '1.2.3',`
`41`	`41`	`}`
`42`	`42`	`}`
`43`		`-`
`44`		`-phalconvm::utils::puppet_modules { 'maxchk':`
`45`		`- modules => {`
`46`		`- 'varnish' => '1.0.0',`
`47`		`- }`
`48`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@`
`26`	`26`	`require => Archive['/tmp/phpmyadmin.tar.gz']`
`27`	`27`	`}`
`28`	`28`
	`29`	`+ $fqdn_rand = fqdn_rand( 9999 )`
	`30`	`+ $blowfish_secret = pw_hash( "${fqdn_rand}", 'SHA-512', 'JXXdi4G0Nl9xlh0emuoHZNSuPvZ0qcfGx1hF4cUfOkf3jS' )`
	`31`	`+`
`29`	`32`	`file { '/srv/www/default/public/phpmyadmin/config.inc.php':`
`30`	`33`	`ensure => 'present',`
`31`	`34`	`content => template( 'phalconvm/phpmyadmin/config.inc.php.erb' ),`