Merge branch 'release/v1.4.4'

CHANGELOG.md

@@ -7,6 +7,13 @@ in 1.x versions.
 To get the diff for a specific change, go to https://github.com/joomlatools/joomlatools-vagrant/commit/xxx where xxx is the change hash.
 To view the diff between two versions, go to https://github.com/joomlatools/joomlatools-vagrant/compare/v1.0.0...v1.0.1
 
+* 1.4.4 (2016-04-07)
+ * Added - Installed the Composer plugin [hirak/prestissimo](https://github.com/hirak/prestissimo) [#14](https://github.com/joomlatools/joomlatools-vagrant/issues/14)
+ * Fixed - Configure PHP's OpenSSL to find the CA bundles [#22](https://github.com/joomlatools/joomlatools-vagrant/issues/22) 
+ * Fixed - Add `joomla.box` to hosts file [#16](https://github.com/joomlatools/joomlatools-vagrant/issues/16)
+ * Fixed - Fix extra slash in administrator urls on dashboard [#19](https://github.com/joomlatools/joomlatools-vagrant/pull/19)
+ * Improved - Upgraded Z-Ray to latest versions [#21](https://github.com/joomlatools/joomlatools-vagrant/issues/21)
+
 * 1.4.3 (2015-12-01)
  * Changed - Renamed `joomlatools/joomla-console` to `joomlatools/console`
 

packer.json

@@ -1,4 +1,8 @@
 {
+  "variables": {
+    "guest_additions_url": "http://download.virtualbox.org/virtualbox/5.0.16/VBoxGuestAdditions_5.0.16.iso",
+    "guest_additions_sha256": "8190f1e4031f8195971c2a97d2d3b1cf2d86fc83219f750d05cee9255c7dad85"
+  },
   "push": {
     "name": "joomlatools/box",
     "vcs": true
@@ -33,10 +37,12 @@
       "boot_wait": "10s",
       "disk_size": 8000,
       "guest_os_type": "Ubuntu_64",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
+      "guest_additions_sha256": "{{user `guest_additions_sha256`}}",
       "http_directory": "packer/http",
-      "iso_checksum": "9e5fecc94b3925bededed0fdca1bd417",
+      "iso_checksum": "2ac1f3e0de626e54d05065d6f549fa3a",
       "iso_checksum_type": "md5",
-      "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.3-server-amd64.iso",
+      "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.4-server-amd64.iso",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
@@ -90,7 +96,7 @@
             "artifact_type": "vagrant.box",
             "metadata": {
                 "provider": "virtualbox",
-                "version": "1.4.3"
+                "version": "1.4.4"
             }
         }]
   ]

packer/scripts/base.sh

@@ -1,6 +1,6 @@
 apt-get update
 apt-get -y upgrade
-apt-get -y install linux-headers-$(uname -r)
+apt-get -y install linux-headers-$(uname -r) build-essential
 
 sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers
 sed -i -e 's/%sudo  ALL=(ALL:ALL) ALL/%sudo  ALL=NOPASSWD:ALL/g' /etc/sudoers

packer/scripts/virtualbox.sh

@@ -1 +1,13 @@
-apt-get -y install virtualbox-guest-utils
+#!/bin/bash
+
+# Mount the disk image
+cd /tmp
+mkdir /tmp/isomount
+mount -t iso9660 -o loop /home/vagrant/VBoxGuestAdditions.iso /tmp/isomount
+
+# Install the drivers
+/tmp/isomount/VBoxLinuxAdditions.run
+
+# Cleanup
+umount isomount
+rm -rf isomount /home/vagrant/VBoxGuestAdditions.iso

puppet/manifests/default.pp

@@ -2,12 +2,16 @@
 Exec { path => [ '/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/' ], timeout => 900 }
 File { owner => 0, group => 0, mode => 0644 }
 
-$box_version = '1.4.3'
+$box_version = '1.4.4'
 
 system::hostname { 'joomlatools':
   ip => '127.0.1.1'
 }
 
+host { 'joomla.box':
+  ip => '127.0.1.1'
+}
+
 file { '/etc/profile.d/joomlatools-box.sh':
   ensure  => present,
   owner   => 'root',
@@ -176,7 +180,7 @@
 }
 
 php::pecl::module { 'oauth':
-  use_package => no,
+  use_package => yes,
   ensure      => present,
   require     => Php::Pear::Config['download_dir']
 }
@@ -213,6 +217,15 @@
   require => Class['Composer']
 }
 
+exec { "composer-plugin-prestissimo":
+  command => "composer global require hirak/prestissimo",
+  path    => ['/usr/bin' , '/bin'],
+  creates => '/home/vagrant/.composer/vendor/hirak/prestissimo',
+  user    => vagrant,
+  environment => 'COMPOSER_HOME=/home/vagrant/.composer',
+  require => Class['Composer']
+}
+
 puphpet::ini { 'custom':
   value   => [
     'sendmail_path = /home/vagrant/.rvm/gems/ruby-2.2.1/bin/catchmail [email protected]',
@@ -233,7 +246,9 @@
     'xdebug.profiler_enable = 0',
     'xdebug.profiler_enable_trigger = 0',
     'xdebug.max_nesting_level = 1000',
-    'xdebug.profiler_output_dir = /var/www/'
+    'xdebug.profiler_output_dir = /var/www/',
+    'openssl.cafile = /etc/ssl/certs/ca-certificates.crt',
+    'openssl.capath = /usr/lib/ssl/'
   ],
   ini     => '/etc/php5/mods-available/custom.ini',
   notify  => Service['apache'],

puppet/modules/composer/manifests/init.pp

@@ -10,6 +10,7 @@
 
   exec { "composer-${install_location}":
     command => "curl -sS https://getcomposer.org/installer | php -- --install-dir=/home/vagrant && mv /home/vagrant/composer.phar ${install_location}/${filename}",
+    environment => ['HOME=/root'],
     path    => ['/usr/bin' , '/bin'],
   }
 }

puppet/modules/phpmanager/files/scripts/phpmanager

@@ -169,10 +169,10 @@ command_use() {
     sudo a2dissite 00-zray &> /dev/null
 
     if [[ "$SHORT" -ge 5500 ]] && [[ "$SHORT" -lt 5600 ]]; then
-        sudo ln -s /opt/zray-php-101832-php5.5.27-linux-debian7-amd64/zray /opt/zray
+        sudo ln -s /opt/zray-php-104202-php5.5.31-linux-debian7-amd64/zray /opt/zray
         sudo a2ensite 00-zray &> /dev/null
     elif [[ "$SHORT" -ge 5600 ]] && [[ "$SHORT" -lt 7000 ]]; then
-        sudo ln -s /opt/zray-php-101832-php5.6.11-linux-debian7-amd64/zray /opt/zray
+        sudo ln -s /opt/zray-php-104202-php5.6.17-linux-debian7-amd64/zray /opt/zray
         sudo a2ensite 00-zray &> /dev/null
     fi
 
@@ -364,8 +364,12 @@ command_restore() {
     sudo cp "/usr/lib/apache2/modules/libphp5.so.original" "/usr/lib/apache2/modules/libphp5.so"
 
     sudo a2ensite 00-zray &> /dev/null
-    sudo rm /opt/zray
-    sudo ln -s /opt/zray-php-101832-php5.6.11-linux-debian7-amd64/zray /opt/zray
+
+    if [ -f /opt/zray ]; then
+        sudo rm /opt/zray
+    fi
+
+    sudo ln -s /opt/zray-php-104202-php5.6.17-linux-debian7-amd64/zray /opt/zray
 
     echo -n "Restarting Apache .. "
     sudo a2enmod php5 &> /dev/null
@@ -612,7 +616,7 @@ sub_getoptions() {
         OPENSSL="--with-openssl=/opt/openssl-1.0.1f"
         patch -p1 < /home/vagrant/phpmanager/patches/openssl.ssl2.patch &> /dev/null
     else
-        OPENSSL="--with-openssl=/opt/openssl-1.0.1f"
+        OPENSSL="--with-openssl=/opt/openssl-1.0.2g"
     fi
     OPTIONS="$OPTIONS $OPENSSL"
 

puppet/modules/phpmanager/manifests/init.pp

@@ -87,7 +87,7 @@
 
   puppi::netinstall { 'flex-2.5.4a':
     path => ["${phpmanager::installation_path}/bison-2.2/bin:/bin:/sbin:/usr/bin:/usr/sbin"],
-    url => 'http://fossies.org/unix/misc/old/flex-2.5.4a.tar.gz',
+    url => 'ftp://ftp.gnome.org/mirror/temp/sf2015/f/fl/flex/flex/2.5.4.a/flex-2.5.4a.tar.gz',
     extracted_dir => 'flex-2.5.4',
     destination_dir => $phpmanager::source_path,
     postextract_command => "${phpmanager::source_path}/flex-2.5.4/configure --prefix=${phpmanager::installation_path}/flex-2.5.4 && make && sudo make install",
@@ -112,6 +112,15 @@
     require => Package['build-essential']
   }
 
+  puppi::netinstall { 'openssl-1.0.2g':
+    url => 'https://www.openssl.org/source/openssl-1.0.2g.tar.gz',
+    retrieve_args => '--no-check-certificate',
+    extracted_dir => 'openssl-1.0.2g',
+    destination_dir => $phpmanager::source_path,
+    postextract_command => "${phpmanager::source_path}/openssl-1.0.2g/config --prefix=${phpmanager::installation_path}/openssl-1.0.2g -fPIC no-gost && make && make depend && make install_sw && ln -s /opt/openssl-1.0.2g/lib /opt/openssl-1.0.2g/lib/x86_64-linux-gnu",
+    require => Package['build-essential']
+  }
+
   puppi::netinstall { 'libxml2-2.7.8':
     url => 'ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz',
     extracted_dir => 'libxml2-2.7.8',
@@ -129,7 +138,7 @@
   }
 
   puppi::netinstall { 'curl-7.15.3':
-    url => 'http://ftp.sunet.se/pub/www/utilities/curl/curl-7.15.3.tar.gz',
+    url => 'ftp://ftp.belnet.be/mirror/pub/ftp.sunet.se/pub/www/utilities/curl/curl-7.15.3.tar.gz',
     extracted_dir => 'curl-7.15.3',
     destination_dir => $phpmanager::source_path,
     require => File["$phpmanager::source_path"]

puppet/modules/zray/manifests/init.pp

@@ -1,31 +1,36 @@
 class zray {
 
-  archive { 'zray-php-101832-php5.6.11-linux-debian7-amd64':
+  Archive <| title == 'zray-php5.6' or title == 'zray-php5.5' |>
+    -> Zray::Plugin <| |>
+
+  archive { 'zray-php5.6':
     ensure           => present,
-    url              => 'http://repos.zend.com/zend-server/early-access/zray-tech-preview/zray-php-101832-php5.6.11-linux-debian7-amd64.tar.gz',
+    url              => 'http://repos.zend.com/zend-server/early-access/zray-tech-preview/zray-php-104202-php5.6.17-linux-debian7-amd64.tar.gz',
     target           => '/opt',
+    timeout          => 600,
     checksum         => false
   }
   ->
   exec {'zray-chown-www-data':
-    command => '/usr/bin/find /opt/zray-php-101832-php5.6.11-linux-debian7-amd64 ! -user www-data -exec /bin/chown www-data:www-data {} \;'
+    command => '/usr/bin/find /opt/zray-php-104202-php5.6.17-linux-debian7-amd64 ! -user www-data -exec /bin/chown www-data:www-data {} \;'
   }
 
-  archive { 'zray-php-101832-php5.5.27-linux-debian7-amd64':
+  archive { 'zray-php5.5':
     ensure           => present,
-    url              => 'http://repos.zend.com/zend-server/early-access/zray-tech-preview/zray-php-101832-php5.5.27-linux-debian7-amd64.tar.gz',
+    url              => 'http://repos.zend.com/zend-server/early-access/zray-tech-preview/zray-php-104202-php5.5.31-linux-debian7-amd64.tar.gz',
     target           => '/opt',
+    timeout          => 600,
     checksum         => false
   }
   ->
   exec {'zray-php5.5-chown-www-data':
-    command => '/usr/bin/find /opt/zray-php-101832-php5.5.27-linux-debian7-amd64 ! -user www-data -exec /bin/chown www-data:www-data {} \;'
+    command => '/usr/bin/find /opt/zray-php-104202-php5.5.31-linux-debian7-amd64 ! -user www-data -exec /bin/chown www-data:www-data {} \;'
   }
 
   file { '/opt/zray':
     ensure  => link,
-    target  => "/opt/zray-php-101832-php5.6.11-linux-debian7-amd64/zray",
-    require => Archive['zray-php-101832-php5.6.11-linux-debian7-amd64']
+    target  => "/opt/zray-php-104202-php5.6.17-linux-debian7-amd64/zray",
+    require => Archive['zray-php5.6']
   }
 
   zray::apache::vhost { 'zray':
@@ -44,10 +49,10 @@
 
   $joomla = {
     'joomla-zray-php5.5' => {
-      install_directory => '/opt/zray-php-101832-php5.5.27-linux-debian7-amd64/zray/runtime/var/plugins'
+      install_directory => '/opt/zray-php-104202-php5.5.31-linux-debian7-amd64/zray/runtime/var/plugins'
     },
     'joomla-zray-php5.6' => {
-      install_directory => '/opt/zray-php-101832-php5.6.11-linux-debian7-amd64/zray/runtime/var/plugins'
+      install_directory => '/opt/zray-php-104202-php5.6.17-linux-debian7-amd64/zray/runtime/var/plugins'
     }
   }
 
@@ -61,10 +66,10 @@
 
   $composer = {
     'composer-zray-php5.5' => {
-      install_directory => '/opt/zray-php-101832-php5.5.27-linux-debian7-amd64/zray/runtime/var/plugins',
+      install_directory => '/opt/zray-php-104202-php5.5.31-linux-debian7-amd64/zray/runtime/var/plugins',
     },
     'composer-zray-php5.6' => {
-      install_directory => '/opt/zray-php-101832-php5.6.11-linux-debian7-amd64/zray/runtime/var/plugins',
+      install_directory => '/opt/zray-php-104202-php5.6.17-linux-debian7-amd64/zray/runtime/var/plugins',
     }
   }
 
@@ -77,7 +82,7 @@
   create_resources('zray::plugin', $composer, $composer_default)
 
   # Delete the Composer.zip files that come with the default installation as they will interfere with the newer version
-  file { ['/opt/zray-php-101832-php5.5.27-linux-debian7-amd64/zray/runtime/var/plugins/Composer.zip', '/opt/zray-php-101832-php5.6.11-linux-debian7-amd64/zray/runtime/var/plugins/Composer.zip']:
+  file { ['/opt/zray-php-104202-php5.5.31-linux-debian7-amd64/zray/runtime/var/plugins/Composer.zip', '/opt/zray-php-104202-php5.6.17-linux-debian7-amd64/zray/runtime/var/plugins/Composer.zip']:
     ensure  => absent,
     require => Zray::Php::Ini['zray']
   }