Merge pull request #168 from joomlatools/feature/158-v1.6.0

Merge feature/158-v1.6.0

CHANGELOG.md

@@ -7,6 +7,27 @@ 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.6.0 (2020-01-24)
+  * Improved - Upgrade to Ubuntu 18.04 LTS [#111](https://github.com/joomlatools/joomlatools-vagrant/issues/111)
+  * Improved - Use PHP 7.3 by default [#165](https://github.com/joomlatools/joomlatools-vagrant/issues/165)
+  * Improved - Updated PHPManager EXTRA_CONFIGURE_ARGUMENTS variable [#130](https://github.com/joomlatools/joomlatools-vagrant/issues/130)
+  * Improved - Use local phpmanager dependencies installer during development [#154](https://github.com/joomlatools/joomlatools-vagrant/issues/154)
+  * Improved - Run two vagrant boxes simultaneously [#37](https://github.com/joomlatools/joomlatools-vagrant/issues/37)
+  * Improved - Use rbenv and update default Ruby version to 2.6.5 [#166](https://github.com/joomlatools/joomlatools-vagrant/issues/166)
+  * Improved - Make mount options configurable [#77](https://github.com/joomlatools/joomlatools-vagrant/issues/77)
+  * Improved - Set joomla.box as default Nginx vhost [#117](https://github.com/joomlatools/joomlatools-vagrant/issues/117)
+  * Improved - Update NodeJS version [#138](https://github.com/joomlatools/joomlatools-vagrant/issues/138)
+  * Added - Install YellowLab tools CLI [#157](https://github.com/joomlatools/joomlatools-vagrant/issues/157)
+  * Added - Install MailHog instead of MailCatcher [#87](https://github.com/joomlatools/joomlatools-vagrant/issues/87)
+  * Added - Use ngrok to share websites [#88](https://github.com/joomlatools/joomlatools-vagrant/issues/88)
+  * Added - Enable http/2 [#146](https://github.com/joomlatools/joomlatools-vagrant/issues/146)
+  * Added - Install Cockpit [#139](https://github.com/joomlatools/joomlatools-vagrant/issues/139)
+  * Added - Install folioshell [#134](https://github.com/joomlatools/joomlatools-vagrant/issues/134)
+  * Fixed - Installing packages requires user input [#156](https://github.com/joomlatools/joomlatools-vagrant/issues/156) 
+  * Fixed - Incorrect host permissions over site files [#150](https://github.com/joomlatools/joomlatools-vagrant/issues/150)
+  * Fixed - Downgrade phing [#133](https://github.com/joomlatools/joomlatools-vagrant/issues/133)
+  * Fixed - Make sure static assets are revalidated [#136](https://github.com/joomlatools/joomlatools-vagrant/issues/136)
+
 * 1.5.1 (2018-06-19)
   * Added - Install php-ldap extension [#123](https://github.com/joomlatools/joomlatools-vagrant/issues/123)
   * Added - Install `tmate` to share terminal [#120](https://github.com/joomlatools/joomlatools-vagrant/issues/120)

README.md

@@ -81,7 +81,7 @@ For more details refer to our [FAQ](https://www.joomlatools.com/developer/tools/
 
 Open source is all about collaboration, so there will be times you will want to share your work with others. Luckily for you, we've pre-configured [ngrok](https://ngrok.com/) to run within the vagrant box. 
 
-We've also created a new box command `box share:site` to help you share your websites.
+We've also created a new box command `box share` to help you share your websites.
 
 ### Terminal
 

Vagrantfile.pkg

@@ -15,7 +15,7 @@ _config = {
     },
     "nfs" => !!(RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/),
     "virtualbox" => {
-        "name"   => "joomlatools-box-build",
+        "name"   => "joomlatools-box",
         "memory" => 1024,
         "cpus"   => 1,
         "natdnshostresolver1" => "on",

packer.json

@@ -1,8 +1,8 @@
 {
   "variables": {
-    "guest_additions_url": "https://download.virtualbox.org/virtualbox/5.2.12/VBoxGuestAdditions_5.2.12.iso",
-    "guest_additions_sha256": "b81d283d9ef88a44e7ac8983422bead0823c825cbfe80417423bd12de91b8046",
-    "version": "1.5.1"
+    "guest_additions_url": "https://download.virtualbox.org/virtualbox/6.0.14/VBoxGuestAdditions_6.0.14.iso",
+    "guest_additions_sha256": "cb82f43a71f91a50b97aa27063c5c8743772a623eb0073ab8daf77e840d73eb1",
+    "version": "1.6.0"
   },
   "push": {
     "name": "joomlatools/box",
@@ -28,8 +28,9 @@
         " keyboard-configuration/layout=USA<wait>",
         " keyboard-configuration/variant=USA<wait>",
         " locale=en_US<wait>",
-        " netcfg/get_hostname=joomlatools<wait>",
-        " netcfg/get_domain=vagrantup.com<wait>",
+        " netcfg/get_domain=vm<wait>",
+        " netcfg/get_hostname=vagrant<wait>",
+        " grub-installer/bootdev=/dev/sda<wait>",
         " noapic<wait>",
         " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>",
         " -- <wait>",
@@ -41,9 +42,9 @@
       "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_additions_sha256": "{{user `guest_additions_sha256`}}",
       "http_directory": "packer/http",
-      "iso_checksum": "07e4bb5569814eab41fafac882ba127893e3ff0bdb7ec931c9b2d040e3e94e7a",
+      "iso_checksum": "7d8e0055d663bffa27c1718685085626cb59346e7626ba3d3f476322271f573e",
       "iso_checksum_type": "sha256",
-      "iso_url": "http://old-releases.ubuntu.com/releases/14.04.4/ubuntu-14.04.4-server-amd64.iso",
+      "iso_url": "http://cdimage.ubuntu.com/ubuntu/releases/bionic/release/ubuntu-18.04.3-server-amd64.iso",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
@@ -68,14 +69,15 @@
     },
     {
       "type": "file",
-      "source": "puppet/hiera",
+      "source": "puppet/environments",
       "destination": "/tmp/"
     },
     {
       "type": "puppet-masterless",
-      "manifest_file": "puppet/manifests",
-      "module_paths": ["puppet/modules/common", "puppet/modules/custom"],
-      "hiera_config_path": "puppet/hiera-packer.yaml",
+      "manifest_file": "puppet/environments/box/manifests",
+      "module_paths": ["puppet/modules", "puppet/environments/box/modules"],
+      "extra_arguments": ["--environmentpath=/tmp/environments/", "--environment=box"],
+      "hiera_config_path": "puppet/environments/box/hiera.yaml",
       "facter": {
         "fqdn": "joomlatools.box"
       }
@@ -84,6 +86,7 @@
       "type": "shell",
       "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'",
       "scripts": [
+        "packer/scripts/update.sh",
         "packer/scripts/cleanup.sh",
         "packer/scripts/zerodisk.sh"
       ]

packer/http/preseed.cfg

@@ -5,32 +5,38 @@ d-i clock-setup/utc-auto boolean true
 d-i finish-install/reboot_in_progress note
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean true
+d-i partman-auto/disk string /dev/sda
 d-i partman-auto-lvm/guided_size string max
 d-i partman-auto/choose_recipe select atomic
 d-i partman-auto/method string lvm
 d-i partman-lvm/confirm boolean true
-d-i partman-lvm/confirm boolean true
 d-i partman-lvm/confirm_nooverwrite boolean true
 d-i partman-lvm/device_remove_lvm boolean true
 d-i partman/choose_partition select finish
 d-i partman/confirm boolean true
 d-i partman/confirm_nooverwrite boolean true
 d-i partman/confirm_write_new_label boolean true
 
+d-i console-setup/ask_detect boolean false
+d-i keyboard-configuration/layoutcode string us
+d-i keyboard-configuration/modelcode string pc105
+d-i debian-installer/locale string en_US.UTF-8
+
 # Default user
 d-i passwd/user-fullname string vagrant
 d-i passwd/username string vagrant
 d-i passwd/user-password password vagrant
 d-i passwd/user-password-again password vagrant
-d-i passwd/username string vagrant
+d-i user-setup/allow-password-weak boolean true
+d-i user-setup/encrypt-home boolean false
+d-i passwd/user-default-groups vagrant sudo
+d-i passwd/user-uid string 900
 
-# Minimum packages (see postinstall.sh)
-d-i pkgsel/include string openssh-server
+# Minimum packages
+d-i pkgsel/include string openssh-server nfs-common
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select none
+d-i pkgsel/upgrade select full-upgrade
 
 d-i time/zone string UTC
-d-i user-setup/allow-password-weak boolean true
-d-i user-setup/encrypt-home boolean false
-tasksel tasksel/first multiselect standard, ubuntu-server
+tasksel tasksel/first multiselect standard, ubuntu-server

packer/scripts/cleanup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "removing puppet"
-sudo apt-get -y purge --auto-remove puppet-common
+sudo apt-get -y purge --auto-remove puppet-agent
 
 echo "cleaning up apt"
 apt-get -y autoremove

packer/scripts/puppet.sh

@@ -2,11 +2,14 @@
 
 set -e
 
-apt-get install -y software-properties-common python-software-properties
+apt-get install -y software-properties-common
 
 cd /tmp
-wget http://apt.puppetlabs.com/puppetlabs-release-trusty.deb
-dpkg -i puppetlabs-release-trusty.deb
+wget https://apt.puppetlabs.com/puppet5-release-bionic.deb
+dpkg -i puppet5-release-bionic.deb
 
 apt-get update
-apt-get install -y puppet-common
+apt-get install -y puppet
+
+# Disable Puppet Agent
+systemctl disable puppet

packer/scripts/serverspec.sh

@@ -2,19 +2,14 @@
 
 set -e
 
-if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
-  source "$HOME/.rvm/scripts/rvm"
-else
-  echo "ERROR: An RVM installation was not found for user $USER"
-  exit 1
-fi
+export PATH=$PATH:/home/vagrant/.gem/ruby/2.5.0/bin/
 
-gem install bundler --no-ri --no-rdoc
+sudo gem install bundler --no-document
 
 cd /tmp/tests
 
 sudo chown vagrant:www-data /var/www
 sudo chmod a=rx,ug+w /var/www
 
 bundle install
-BACKEND=exec bundle exec rake spec
+BACKEND=exec bundle exec rake spec

packer/scripts/update.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "installing package updates"
+sudo apt-get -y upgrade

puppet/Puppetfile

@@ -1,6 +1,7 @@
 forge 'https://forgeapi.puppetlabs.com'
 
 mod 'camptocamp-openssl', '1.10.0'
+mod 'jdowning-rbenv', '2.5.0'
 mod 'petems-swap_file', '4.0.0'
 mod 'puppetlabs-apache', '5.0.0'
 mod 'puppetlabs-apt', '6.2.1'
@@ -9,4 +10,4 @@ mod 'puppetlabs-mysql', '7.0.0'
 mod 'puppetlabs-stdlib', '4.25.1'
 mod 'puppet-nodejs', '7.0.1'
 mod 'puppet-php', '6.0.2'
-mod 'puppet-ssh_keygen', '3.0.1'
+mod 'puppet-ssh_keygen', '3.0.1'

puppet/Puppetfile.lock

@@ -7,6 +7,8 @@ FORGE
       puppetlabs-stdlib (< 6.0.0, >= 3.2.0)
     herculesteam-augeasproviders_sysctl (2.3.1)
       herculesteam-augeasproviders_core (< 3.0.0, >= 2.4.0)
+    jdowning-rbenv (2.5.0)
+      puppetlabs-stdlib (< 7.0.0, >= 4.1.0)
     petems-swap_file (4.0.0)
       herculesteam-augeasproviders_core (< 3.0.0, >= 2.1.0)
       herculesteam-augeasproviders_sysctl (< 3.0.0, >= 2.1.0)
@@ -42,6 +44,7 @@ FORGE
 
 DEPENDENCIES
   camptocamp-openssl (= 1.10.0)
+  jdowning-rbenv (= 2.5.0)
   petems-swap_file (= 4.0.0)
   puppet-nodejs (= 7.0.1)
   puppet-php (= 6.0.2)

puppet/environments/box/manifests/default.pp

@@ -2,4 +2,4 @@
 Exec { path => [ '/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/' ], timeout => 900 }
 File { owner => 0, group => 0, backup => false }
 
-$box_version = '1.5.1'
+$box_version = '1.6.0'

puppet/environments/box/modules/profiles/files/box/phpmanager/scripts/phpmanager

@@ -132,7 +132,7 @@ command_use() {
         command_install $VERSION
     fi
 
-    sudo service php-fpm stop > /dev/null 2>&1
+    sudo systemctl stop php-fpm > /dev/null 2>&1
 
     # Install the binaries
     for BINARY in "${BINARIES[@]}"
@@ -148,7 +148,7 @@ command_use() {
     sudo rm -f /opt/php/php-fpm.sock
     sudo ln -s "/run/php/${VERSION}-fpm.sock" /opt/php/php-fpm.sock
 
-    sudo service php-fpm start > /dev/null 2>&1
+    sudo systemctl start php-fpm > /dev/null 2>&1
 
     echo -e "Installed binaries. PHP version is now:\n"
     php -v
@@ -295,7 +295,7 @@ command_restore() {
         exit 0
     fi
 
-    sudo service php-fpm stop > /dev/null 2>&1
+    sudo systemctl stop php-fpm > /dev/null 2>&1
 
     for BINARY in "${BINARIES[@]}"
     do
@@ -309,7 +309,7 @@ command_restore() {
 
     sudo rm -f /opt/php/php-fpm.sock
     sudo ln -s "/run/php/php7.3-fpm.sock" /opt/php/php-fpm.sock
-    sudo service php-fpm start > /dev/null 2>&1
+    sudo systemctl start php-fpm > /dev/null 2>&1
 
     echo -e "Restored PHP, version is now: \n"
     php -v

puppet/environments/box/modules/profiles/files/box/scripts/data/navigation.php

@@ -54,5 +54,5 @@
 
 $navigation['cockpit']['title'] = 'Cockpit';
 $navigation['cockpit']['source'] = 'http://joomla.box/cockpit';
-$navigation['cockpit']['type'] = 'iframe';
+$navigation['cockpit']['type'] = 'page';
 $navigation['cockpit']['status'] = 'active';