From f28401aeae1e025e97243a6cc4bd0066e7648ccc Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Wed, 20 Nov 2019 11:49:46 +0100
Subject: [PATCH 01/38] #158: Fix tests

---
 packer.json                                       | 1 +
 tests/spec/default/{mailcatcher.rb => mailhog.rb} | 8 ++++----
 tests/spec/default/mysql.rb                       | 2 +-
 tests/spec/default/php.rb                         | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename tests/spec/default/{mailcatcher.rb => mailhog.rb} (57%)

diff --git a/packer.json b/packer.json
index 5e1f514..0eee975 100644
--- a/packer.json
+++ b/packer.json
@@ -84,6 +84,7 @@
       "type": "shell",
       "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'",
       "scripts": [
+        "packer/scripts/update.sh",
         "packer/scripts/cleanup.sh",
         "packer/scripts/zerodisk.sh"
       ]
diff --git a/tests/spec/default/mailcatcher.rb b/tests/spec/default/mailhog.rb
similarity index 57%
rename from tests/spec/default/mailcatcher.rb
rename to tests/spec/default/mailhog.rb
index cad69bb..9b4d1eb 100644
--- a/tests/spec/default/mailcatcher.rb
+++ b/tests/spec/default/mailhog.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe '## MailCatcher' do
-    describe service('mailcatcher'), :if => os[:family] == 'ubuntu' do
+describe '## Mailhog' do
+    describe service('mailhog'), :if => os[:family] == 'ubuntu' do
       it { should be_enabled }
       it { should be_running }
     end
@@ -12,10 +12,10 @@
 
     describe file('/etc/apache2/joomla.box-include.conf') do
       it { should exist }
-      its(:content) { should match /Redirect permanent \/mailcatcher http:\/\/joomla.box:1080/ }
+      its(:content) { should match /Redirect permanent \/mailhog http:\/\/joomla.box:8025/ }
     end
 
-    describe port(1080) do
+    describe port(8025) do
       it { should be_listening }
     end
 end
\ No newline at end of file
diff --git a/tests/spec/default/mysql.rb b/tests/spec/default/mysql.rb
index fb24847..aef15f5 100644
--- a/tests/spec/default/mysql.rb
+++ b/tests/spec/default/mysql.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe '## MySQL' do
-    describe package('mariadb-server-10.3'), :if => os[:family] == 'ubuntu' do
+    describe package('mariadb-server-10.4'), :if => os[:family] == 'ubuntu' do
       it { should be_installed }
     end
 
diff --git a/tests/spec/default/php.rb b/tests/spec/default/php.rb
index f27be2b..9c2e016 100644
--- a/tests/spec/default/php.rb
+++ b/tests/spec/default/php.rb
@@ -21,7 +21,7 @@
 
         describe '### PHP config parameters' do
             context php_config('sendmail_path') do
-              its(:value) { should match /\/usr\/bin\/env catchmail -fnoreply@example.com/ }
+              its(:value) { should match /\/usr\/local\/bin\/mhsendmail/ }
             end
 
             context php_config('xdebug.profiler_output_dir') do

From 9cbbf52ced43f8916f572a47b90fd000f50b28f9 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Wed, 20 Nov 2019 12:36:14 +0100
Subject: [PATCH 02/38] #158: Update all packages before cleaning up

---
 packer/scripts/update.sh | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packer/scripts/update.sh

diff --git a/packer/scripts/update.sh b/packer/scripts/update.sh
new file mode 100644
index 0000000..b073c8a
--- /dev/null
+++ b/packer/scripts/update.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "installing package updates"
+sudo apt-get -y upgrade
\ No newline at end of file

From 7cf7785cadcbf3d688bc5f716c1284513c6f291e Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Wed, 20 Nov 2019 12:37:11 +0100
Subject: [PATCH 03/38] #158: Bump version to v1.6.0

---
 packer.json                                  | 2 +-
 puppet/environments/box/manifests/default.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packer.json b/packer.json
index 0eee975..324a132 100644
--- a/packer.json
+++ b/packer.json
@@ -2,7 +2,7 @@
   "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"
+    "version": "1.6.0"
   },
   "push": {
     "name": "joomlatools/box",
diff --git a/puppet/environments/box/manifests/default.pp b/puppet/environments/box/manifests/default.pp
index 28fc6b3..fc8261c 100644
--- a/puppet/environments/box/manifests/default.pp
+++ b/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'
\ No newline at end of file
+$box_version = '1.6.0'
\ No newline at end of file

From 1ca9270e90298ed53079b1d322c7016089699350 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Wed, 20 Nov 2019 16:07:13 +0100
Subject: [PATCH 04/38] #158: Workaround for failing GPG keys

---
 .../box/modules/profiles/manifests/mysql.pp       | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/puppet/environments/box/modules/profiles/manifests/mysql.pp b/puppet/environments/box/modules/profiles/manifests/mysql.pp
index 70aa6e3..d6dabed 100644
--- a/puppet/environments/box/modules/profiles/manifests/mysql.pp
+++ b/puppet/environments/box/modules/profiles/manifests/mysql.pp
@@ -13,10 +13,23 @@
 
     $mysqld_options = merge($default_mysqld_config, $mysqld_config)
 
+    # Little workaround to deal with apt failing to retrieve
+    # GPG keys from the keyservers.
+    # It fails randomly on different machines and using a different
+    # key server didn't solve it either.
+    #
+    # Errors received are either
+    # - gpg: keyserver receive failed: Invalid argument
+    # - gpg: keyserver receive failed: Server indicated a failure
+    exec { 'download-mariadb-gpg-key':
+      command => '/usr/bin/wget https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x177F4010FE56CA3336300305F1656F24C74CD1D8 -O /tmp/mariadb.gpg.key && apt-key add /tmp/mariadb.gpg.key',
+      unless => 'apt-key list 2> /dev/null | grep mariadb'
+    }
+
     apt::source { 'mariadb':
         location   => 'http://mariadb.mirror.nucleus.be/repo/10.4/ubuntu',
         repos      => 'main',
-        key        => '177F4010FE56CA3336300305F1656F24C74CD1D8'
+        require    => Exec['download-mariadb-gpg-key']
     }
 
     class { '::mysql::server':

From 6065a6ac2f8015bee7dc8d93fb1c045552b01abc Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Wed, 20 Nov 2019 17:16:25 +0100
Subject: [PATCH 05/38] #158: Restart apache2 after creating the dashboard
 vhost

---
 puppet/environments/box/modules/profiles/manifests/box.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/puppet/environments/box/modules/profiles/manifests/box.pp b/puppet/environments/box/modules/profiles/manifests/box.pp
index 843bc81..c88e050 100644
--- a/puppet/environments/box/modules/profiles/manifests/box.pp
+++ b/puppet/environments/box/modules/profiles/manifests/box.pp
@@ -24,6 +24,7 @@
     override            => 'All',
     additional_includes => ['/etc/apache2/joomla.box-include.conf'],
     access_log_env_var  => '!dontlog',
+    notify              => Service['httpd'],
     require             => File['/etc/apache2/joomla.box-include.conf']
   }
 
@@ -41,6 +42,7 @@
     override            => 'All',
     additional_includes => ['/etc/apache2/joomla.box-include.conf'],
     access_log_env_var  => '!dontlog',
+    notify              => Service['httpd'],
     require             => File['/etc/apache2/joomla.box-include.conf']
   }
 

From 4d4ec16d345385441081de95f641a9c0ffe5c494 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Thu, 21 Nov 2019 10:58:22 +0100
Subject: [PATCH 06/38] #158: Update phpmanager to use systemd

---
 .../profiles/files/box/phpmanager/scripts/phpmanager      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/puppet/environments/box/modules/profiles/files/box/phpmanager/scripts/phpmanager b/puppet/environments/box/modules/profiles/files/box/phpmanager/scripts/phpmanager
index 90229ab..c84caa0 100755
--- a/puppet/environments/box/modules/profiles/files/box/phpmanager/scripts/phpmanager
+++ b/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

From c53e7beb102084613d7a453f6affa4a68b251090 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Thu, 21 Nov 2019 11:06:44 +0100
Subject: [PATCH 07/38] #158: Add tests for folioshell

---
 tests/spec/default/foliolabs.rb   | 28 ++++++++++++++++++++++++++++
 tests/spec/default/joomlatools.rb |  8 ++++----
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 tests/spec/default/foliolabs.rb

diff --git a/tests/spec/default/foliolabs.rb b/tests/spec/default/foliolabs.rb
new file mode 100644
index 0000000..92a9ea8
--- /dev/null
+++ b/tests/spec/default/foliolabs.rb
@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe '## Foliolabs' do
+    let(:sudo_options) { '-u vagrant -i' } # Simulate a login as the user, so that the PATH variable is loaded
+
+    describe '### joomlatools-folioshell' do
+
+        describe command('/home/vagrant/.composer/vendor/bin/folioshell -V') do
+          its(:stdout) { should match /FolioShell - WordPress Console tools \d\.\d+\.\d+/ }
+        end
+
+        describe command('/home/vagrant/.composer/vendor/bin/folioshell site:create serverspectest-wp') do
+          its(:exit_status) { should eq 0 }
+
+          describe command('mysql -s -N -uroot -proot -e "SHOW DATABASES;"') do
+            its(:stdout) { should match /sites_serverspectest-wp/ }
+          end
+
+          describe command('curl -s http://joomla.box/sites.php') do
+            its(:stdout) { should match /serverspectest-wp/ }
+          end
+        end
+
+        describe command('/home/vagrant/.composer/vendor/bin/folioshell site:delete serverspectest-wp') do
+          its(:exit_status) { should eq 0 }
+        end
+    end
+end
\ No newline at end of file
diff --git a/tests/spec/default/joomlatools.rb b/tests/spec/default/joomlatools.rb
index 69360e3..e840e2a 100644
--- a/tests/spec/default/joomlatools.rb
+++ b/tests/spec/default/joomlatools.rb
@@ -9,19 +9,19 @@
           its(:stdout) { should match /Joomla Console tools \d\.\d+\.\d+/ }
         end
 
-        describe command('/home/vagrant/.composer/vendor/bin/joomla site:create serverspectest') do
+        describe command('/home/vagrant/.composer/vendor/bin/joomla site:create serverspectest-joomla') do
           its(:exit_status) { should eq 0 }
 
           describe command('mysql -s -N -uroot -proot -e "SHOW DATABASES;"') do
-            its(:stdout) { should match /sites_serverspectest/ }
+            its(:stdout) { should match /sites_serverspectest-joomla/ }
           end
 
           describe command('curl -s http://joomla.box/sites.php') do
-            its(:stdout) { should match /serverspectest/ }
+            its(:stdout) { should match /serverspectest-joomla/ }
           end
         end
 
-        describe command('/home/vagrant/.composer/vendor/bin/joomla site:delete serverspectest') do
+        describe command('/home/vagrant/.composer/vendor/bin/joomla site:delete serverspectest-joomla') do
           its(:exit_status) { should eq 0 }
         end
     end

From 0f574c5924db108456bb270084cda4f4df4ed82d Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Fri, 29 Nov 2019 20:27:55 +0100
Subject: [PATCH 08/38] #158: Update packer puppet-masterless builder

---
 packer.json              | 9 +++++----
 packer/scripts/puppet.sh | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packer.json b/packer.json
index 324a132..70185e7 100644
--- a/packer.json
+++ b/packer.json
@@ -68,14 +68,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": ["--environment=box", "--environmentpath /tmp/environments/"],
+      "hiera_config_path": "puppet/environments/box/hiera.yaml",
       "facter": {
         "fqdn": "joomlatools.box"
       }
diff --git a/packer/scripts/puppet.sh b/packer/scripts/puppet.sh
index c17dd37..42190f9 100644
--- a/packer/scripts/puppet.sh
+++ b/packer/scripts/puppet.sh
@@ -5,8 +5,8 @@ set -e
 apt-get install -y software-properties-common python-software-properties
 
 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

From c8e77a6d8074a7e546634dfcd8a8d8a774be664a Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Fri, 29 Nov 2019 20:49:25 +0100
Subject: [PATCH 09/38] #158: Disable Puppet Agent

---
 packer/scripts/cleanup.sh | 2 +-
 packer/scripts/puppet.sh  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packer/scripts/cleanup.sh b/packer/scripts/cleanup.sh
index 5fcf47b..1d3c52a 100644
--- a/packer/scripts/cleanup.sh
+++ b/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
 
 echo "cleaning up apt"
 apt-get -y autoremove
diff --git a/packer/scripts/puppet.sh b/packer/scripts/puppet.sh
index 42190f9..205dde1 100644
--- a/packer/scripts/puppet.sh
+++ b/packer/scripts/puppet.sh
@@ -10,3 +10,7 @@ dpkg -i puppet5-release-bionic.deb
 
 apt-get update
 apt-get install -y puppet
+
+# Disable Puppet Agent
+systemctl disable puppet
+systemctl disable mcollective

From 8619954cc9c16b4dcbbce22346487c4af8c90823 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Sat, 30 Nov 2019 12:15:30 +0100
Subject: [PATCH 10/38] #158: Use the right base box

---
 packer.json               | 11 ++++++-----
 packer/scripts/cleanup.sh |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packer.json b/packer.json
index 70185e7..c892665 100644
--- a/packer.json
+++ b/packer.json
@@ -1,7 +1,7 @@
 {
   "variables": {
-    "guest_additions_url": "https://download.virtualbox.org/virtualbox/5.2.12/VBoxGuestAdditions_5.2.12.iso",
-    "guest_additions_sha256": "b81d283d9ef88a44e7ac8983422bead0823c825cbfe80417423bd12de91b8046",
+    "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": {
@@ -41,9 +41,9 @@
       "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_additions_sha256": "{{user `guest_additions_sha256`}}",
       "http_directory": "packer/http",
-      "iso_checksum": "07e4bb5569814eab41fafac882ba127893e3ff0bdb7ec931c9b2d040e3e94e7a",
+      "iso_checksum": "7a1c2966f82268c14560386fbc467d58c3fbd2793f3b1f657baee609b80d39a8",
       "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://old-releases.ubuntu.com/releases/bionic/ubuntu-18.04-live-server-amd64.iso",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
@@ -73,9 +73,10 @@
     },
     {
       "type": "puppet-masterless",
+      "puppet_bin_dir": "/opt/puppetlabs/bin",
       "manifest_file": "puppet/environments/box/manifests",
       "module_paths": ["puppet/modules", "puppet/environments/box/modules"],
-      "extra_arguments": ["--environment=box", "--environmentpath /tmp/environments/"],
+      "extra_arguments": ["--environmentpath=/tmp/environments/", "--environment=box"],
       "hiera_config_path": "puppet/environments/box/hiera.yaml",
       "facter": {
         "fqdn": "joomlatools.box"
diff --git a/packer/scripts/cleanup.sh b/packer/scripts/cleanup.sh
index 1d3c52a..316c58a 100644
--- a/packer/scripts/cleanup.sh
+++ b/packer/scripts/cleanup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "removing puppet"
-sudo apt-get -y purge --auto-remove puppet
+sudo apt-get -y purge --auto-remove puppet-agent
 
 echo "cleaning up apt"
 apt-get -y autoremove

From 853523c8dca584b9933b189c817cee300c2d121c Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Sat, 30 Nov 2019 19:27:35 +0100
Subject: [PATCH 11/38] #158: Update CHANGELOG

---
 CHANGELOG.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6465e79..3566e52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,26 @@ 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 (2019-12-01)
+  * 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 - 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)

From d5a28c400220bd71cf62953fbf6cbd010539112f Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Sat, 30 Nov 2019 19:38:03 +0100
Subject: [PATCH 12/38] #158, #138: Update Node to 12.x

---
 puppet/environments/box/modules/profiles/manifests/nodejs.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/puppet/environments/box/modules/profiles/manifests/nodejs.pp b/puppet/environments/box/modules/profiles/manifests/nodejs.pp
index c838af7..b4c940f 100644
--- a/puppet/environments/box/modules/profiles/manifests/nodejs.pp
+++ b/puppet/environments/box/modules/profiles/manifests/nodejs.pp
@@ -3,7 +3,7 @@
 ) {
 
   class { '::nodejs':
-    repo_url_suffix => '10.x',
+    repo_url_suffix => '12.x',
   }
 
 }
\ No newline at end of file

From d35d4d7829c866706cc232e3bf4b1812d7f1fcba Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Mon, 2 Dec 2019 13:40:39 +0100
Subject: [PATCH 13/38] #158: Update preseed file and boot commands

---
 packer.json              | 10 +++++-----
 packer/http/preseed.cfg  | 22 ++++++++++++++--------
 packer/scripts/puppet.sh |  3 +--
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/packer.json b/packer.json
index c892665..96e0dcf 100644
--- a/packer.json
+++ b/packer.json
@@ -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": "7a1c2966f82268c14560386fbc467d58c3fbd2793f3b1f657baee609b80d39a8",
+      "iso_checksum": "7d8e0055d663bffa27c1718685085626cb59346e7626ba3d3f476322271f573e",
       "iso_checksum_type": "sha256",
-      "iso_url": "http://old-releases.ubuntu.com/releases/bionic/ubuntu-18.04-live-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,
@@ -73,7 +74,6 @@
     },
     {
       "type": "puppet-masterless",
-      "puppet_bin_dir": "/opt/puppetlabs/bin",
       "manifest_file": "puppet/environments/box/manifests",
       "module_paths": ["puppet/modules", "puppet/environments/box/modules"],
       "extra_arguments": ["--environmentpath=/tmp/environments/", "--environment=box"],
diff --git a/packer/http/preseed.cfg b/packer/http/preseed.cfg
index 202c851..39a3dc3 100644
--- a/packer/http/preseed.cfg
+++ b/packer/http/preseed.cfg
@@ -5,11 +5,11 @@ 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
@@ -17,20 +17,26 @@ 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
\ No newline at end of file
diff --git a/packer/scripts/puppet.sh b/packer/scripts/puppet.sh
index 205dde1..9e35336 100644
--- a/packer/scripts/puppet.sh
+++ b/packer/scripts/puppet.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-apt-get install -y software-properties-common python-software-properties
+apt-get install -y software-properties-common
 
 cd /tmp
 wget https://apt.puppetlabs.com/puppet5-release-bionic.deb
@@ -13,4 +13,3 @@ apt-get install -y puppet
 
 # Disable Puppet Agent
 systemctl disable puppet
-systemctl disable mcollective

From bf42d66602f506b3a32b2e72bcb513a8a06c469d Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Mon, 2 Dec 2019 13:46:14 +0100
Subject: [PATCH 14/38] #158: Use hostnamectl to set hostname

---
 .../box/modules/profiles/manifests/system/hostname.pp      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/puppet/environments/box/modules/profiles/manifests/system/hostname.pp b/puppet/environments/box/modules/profiles/manifests/system/hostname.pp
index aa26d72..2cfca95 100644
--- a/puppet/environments/box/modules/profiles/manifests/system/hostname.pp
+++ b/puppet/environments/box/modules/profiles/manifests/system/hostname.pp
@@ -17,7 +17,7 @@
       "$hostname" => undef,
       default     => $alias
     },
-    before => Exec['service hostname restart'],
+    before => Exec['set-hostname'],
   }
 
   file { '/etc/mailname':
@@ -34,10 +34,11 @@
     group   => 'root',
     mode    => '0644',
     content => "${name}\n",
-    notify  => Exec['service hostname restart'],
+    notify  => Exec['set-hostname'],
   }
 
-  exec { 'service hostname restart':
+  exec { 'set-hostname':
+    command => "/usr/bin/hostnamectl set-hostname ${name}",
     refreshonly => true
   }
 }
\ No newline at end of file

From d9242be0fab79611382c3f8253133deb4cf8acf9 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Mon, 2 Dec 2019 14:49:37 +0100
Subject: [PATCH 15/38] #158: Specify architecture for mariadb repository

---
 puppet/environments/box/modules/profiles/manifests/mysql.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/puppet/environments/box/modules/profiles/manifests/mysql.pp b/puppet/environments/box/modules/profiles/manifests/mysql.pp
index d6dabed..d5e6dcd 100644
--- a/puppet/environments/box/modules/profiles/manifests/mysql.pp
+++ b/puppet/environments/box/modules/profiles/manifests/mysql.pp
@@ -27,8 +27,9 @@
     }
 
     apt::source { 'mariadb':
-        location   => 'http://mariadb.mirror.nucleus.be/repo/10.4/ubuntu',
+        location   => 'http://ams2.mirrors.digitalocean.com/mariadb/repo/10.4/ubuntu',
         repos      => 'main',
+        architecture => 'amd64',
         require    => Exec['download-mariadb-gpg-key']
     }
 

From 74ae57a81dc87c6b7606cb1969f4b22141fffe46 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Mon, 2 Dec 2019 16:01:04 +0100
Subject: [PATCH 16/38] Revert "#158, #138: Update Node to 12.x"

This reverts commit d5a28c400220bd71cf62953fbf6cbd010539112f.
---
 puppet/environments/box/modules/profiles/manifests/nodejs.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/puppet/environments/box/modules/profiles/manifests/nodejs.pp b/puppet/environments/box/modules/profiles/manifests/nodejs.pp
index b4c940f..c838af7 100644
--- a/puppet/environments/box/modules/profiles/manifests/nodejs.pp
+++ b/puppet/environments/box/modules/profiles/manifests/nodejs.pp
@@ -3,7 +3,7 @@
 ) {
 
   class { '::nodejs':
-    repo_url_suffix => '12.x',
+    repo_url_suffix => '10.x',
   }
 
 }
\ No newline at end of file

From 533115941795e435fb1ea9fd45510157826ab7ed Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Wed, 4 Dec 2019 17:20:59 +0100
Subject: [PATCH 17/38] #158: Fix ServerSpec tests

---
 packer/scripts/serverspec.sh                          | 11 +++--------
 .../box/modules/profiles/files/wetty/wetty.service    |  2 ++
 .../box/modules/profiles/manifests/wetty.pp           |  1 +
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packer/scripts/serverspec.sh b/packer/scripts/serverspec.sh
index 779e913..3be105e 100644
--- a/packer/scripts/serverspec.sh
+++ b/packer/scripts/serverspec.sh
@@ -2,14 +2,9 @@
 
 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-ri --no-rdoc
 
 cd /tmp/tests
 
@@ -17,4 +12,4 @@ sudo chown vagrant:www-data /var/www
 sudo chmod a=rx,ug+w /var/www
 
 bundle install
-BACKEND=exec bundle exec rake spec
\ No newline at end of file
+BACKEND=exec bundle exec rake spec
diff --git a/puppet/environments/box/modules/profiles/files/wetty/wetty.service b/puppet/environments/box/modules/profiles/files/wetty/wetty.service
index 25e6b54..8ae7a25 100644
--- a/puppet/environments/box/modules/profiles/files/wetty/wetty.service
+++ b/puppet/environments/box/modules/profiles/files/wetty/wetty.service
@@ -8,6 +8,8 @@ User=vagrant
 Group=vagrant
 WorkingDirectory=/home/vagrant/
 ExecStart=/usr/local/bin/wetty -p 3000 --sshauth publickey,password --sshuser vagrant
+Restart=on-failure
+RestartSec=3
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/puppet/environments/box/modules/profiles/manifests/wetty.pp b/puppet/environments/box/modules/profiles/manifests/wetty.pp
index 6a02ad6..b347591 100644
--- a/puppet/environments/box/modules/profiles/manifests/wetty.pp
+++ b/puppet/environments/box/modules/profiles/manifests/wetty.pp
@@ -7,6 +7,7 @@
     exec { 'yarn-install-wetty':
         command     => '/usr/bin/yarn global add wetty.js',
         unless      => 'which wetty',
+        notify      => Service['wetty'],
         require     => Package['yarn']
     }
 

From dfdc6c050ae00af572a95da31646a3e4deb3f841 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Wed, 4 Dec 2019 17:30:12 +0100
Subject: [PATCH 18/38] #158: Fix default box name

---
 Vagrantfile.pkg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vagrantfile.pkg b/Vagrantfile.pkg
index 48e9706..76bee00 100644
--- a/Vagrantfile.pkg
+++ b/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",

From 4d402363af147731fb529701364d44d1778b6c5d Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Mon, 23 Dec 2019 11:34:17 +0100
Subject: [PATCH 19/38] #158: Update gemfile.lock for serverspec tests

---
 tests/Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Gemfile.lock b/tests/Gemfile.lock
index 5565e28..589c748 100644
--- a/tests/Gemfile.lock
+++ b/tests/Gemfile.lock
@@ -44,4 +44,4 @@ DEPENDENCIES
   serverspec
 
 BUNDLED WITH
-   2.0.2
+   2.1.2

From fe50f3b728e6973b9e8b5817dbe99c32c81b3083 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Thu, 2 Jan 2020 16:12:42 +0100
Subject: [PATCH 20/38] #166: Add jdowning-rbenv to Puppetfile

---
 puppet/Puppetfile      | 3 ++-
 puppet/Puppetfile.lock | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/puppet/Puppetfile b/puppet/Puppetfile
index da9e697..09a4156 100644
--- a/puppet/Puppetfile
+++ b/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'
\ No newline at end of file
+mod 'puppet-ssh_keygen', '3.0.1'
diff --git a/puppet/Puppetfile.lock b/puppet/Puppetfile.lock
index 69b533b..b889d3f 100644
--- a/puppet/Puppetfile.lock
+++ b/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)

From 34aef8ab9a718aaae1a160858a9f2bc2c6404a3b Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Thu, 2 Jan 2020 16:13:30 +0100
Subject: [PATCH 21/38] #166: Use rbenv to install Ruby 2.6.5

---
 .../box/modules/profiles/manifests/ruby.pp    | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/puppet/environments/box/modules/profiles/manifests/ruby.pp b/puppet/environments/box/modules/profiles/manifests/ruby.pp
index 6448181..470323d 100644
--- a/puppet/environments/box/modules/profiles/manifests/ruby.pp
+++ b/puppet/environments/box/modules/profiles/manifests/ruby.pp
@@ -1,21 +1,20 @@
-class profiles::ruby {
+class profiles::ruby(
+  $version = '2.6.5'
+) {
 
-  Package <| tag == 'ruby' |>
-    -> Exec <| tag == 'rubygem' |>
+  class { '::rbenv': }
 
-  package { 'ruby':
-    ensure => '1:2.5.1',
-    tag    => ['ruby']
+  rbenv::plugin { 'rbenv/ruby-build':
+    latest => true
   }
 
-  package { 'ruby-dev':
-    ensure => installed,
-    tag    => ['ruby']
+  rbenv::build { $version:
+    global => true
   }
 
   file_line { 'add-gem-bin-dir-to-path':
     path    => '/home/vagrant/.bashrc',
-    line    => 'export PATH=$PATH:/home/vagrant/.gem/ruby/2.5.0/bin/'
+    line    => "export PATH=/usr/local/rbenv/versions/${version}/bin:\$PATH"
   }
 
 }
\ No newline at end of file

From 389f9ac7ed577d00f0cefb841011258be5b24101 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Thu, 2 Jan 2020 16:13:54 +0100
Subject: [PATCH 22/38] #166: Use rbenv::gem to install Ruby-based tools

---
 .../modules/profiles/manifests/box/tools.pp   | 32 +++----------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/puppet/environments/box/modules/profiles/manifests/box/tools.pp b/puppet/environments/box/modules/profiles/manifests/box/tools.pp
index e1fb4a1..9489550 100644
--- a/puppet/environments/box/modules/profiles/manifests/box/tools.pp
+++ b/puppet/environments/box/modules/profiles/manifests/box/tools.pp
@@ -1,33 +1,9 @@
 class profiles::box::tools {
 
-  exec {'install-capistrano-gem':
-    user    => vagrant,
-    command => '/usr/bin/gem install --user-install --no-ri --no-rdoc capistrano',
-    environment => ['HOME=/home/vagrant'],
-    unless  => 'test -x /home/vagrant/.gem/ruby/2.5.0/bin/cap',
-    path    => ['/usr/bin/', '/bin/', '/home/vagrant/.gem/ruby/2.5.0/bin/'],
-    timeout => 900,
-    tag     => ['rubygem']
-  }
-
-  exec {'install-bundler-gem':
-    user    => vagrant,
-    command => 'gem install --user-install --no-ri --no-rdoc bundler',
-    environment => ['HOME=/home/vagrant'],
-    unless  => 'test -x /home/vagrant/.gem/ruby/2.5.0/bin/bundle',
-    path    => ['/usr/bin/', '/bin/', '/home/vagrant/.gem/ruby/2.5.0/bin/'],
-    timeout => 900,
-    tag     => ['rubygem']
-  }
-
-  exec {'install-sass-gem':
-    user    => vagrant,
-    command => '/usr/bin/gem install --user-install --no-ri --no-rdoc sass compass',
-    environment => ['HOME=/home/vagrant'],
-    unless  => 'test -x /home/vagrant/.gem/ruby/2.5.0/bin/sass',
-    path    => ['/usr/bin/', '/bin/', '/home/vagrant/.gem/ruby/2.5.0/bin/'],
-    timeout => 900,
-    tag     => ['rubygem']
+  rbenv::gem { ['capistrano', 'bundle', 'sass']:
+    ruby_version => $::profiles::ruby::version,
+    skip_docs    => true,
+    timeout      => 900
   }
 
   package { ['yarn', 'less', 'autoless', 'uglify-js']:

From fe34cb868a2ef2545ae71780def8ffc787617272 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Thu, 2 Jan 2020 16:21:13 +0100
Subject: [PATCH 23/38] #166: Remove bundler resource

It's being installed out of the box through
the rbenv::build resource
---
 puppet/environments/box/modules/profiles/manifests/box/tools.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/puppet/environments/box/modules/profiles/manifests/box/tools.pp b/puppet/environments/box/modules/profiles/manifests/box/tools.pp
index 9489550..91d5c52 100644
--- a/puppet/environments/box/modules/profiles/manifests/box/tools.pp
+++ b/puppet/environments/box/modules/profiles/manifests/box/tools.pp
@@ -1,6 +1,6 @@
 class profiles::box::tools {
 
-  rbenv::gem { ['capistrano', 'bundle', 'sass']:
+  rbenv::gem { ['capistrano', 'sass']:
     ruby_version => $::profiles::ruby::version,
     skip_docs    => true,
     timeout      => 900

From 0a6408b8aebdfc4792df0c4581db0d8f204e7a18 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Thu, 2 Jan 2020 16:36:28 +0100
Subject: [PATCH 24/38] #166: Make sure to install Bundler >2.0'

---
 .../box/modules/profiles/manifests/ruby.pp           |  3 ++-
 tests/Gemfile.lock                                   | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/puppet/environments/box/modules/profiles/manifests/ruby.pp b/puppet/environments/box/modules/profiles/manifests/ruby.pp
index 470323d..2636e23 100644
--- a/puppet/environments/box/modules/profiles/manifests/ruby.pp
+++ b/puppet/environments/box/modules/profiles/manifests/ruby.pp
@@ -9,7 +9,8 @@
   }
 
   rbenv::build { $version:
-    global => true
+    global          => true,
+    bundler_version => '>2.0'
   }
 
   file_line { 'add-gem-bin-dir-to-path':
diff --git a/tests/Gemfile.lock b/tests/Gemfile.lock
index 589c748..362f3d8 100644
--- a/tests/Gemfile.lock
+++ b/tests/Gemfile.lock
@@ -12,25 +12,25 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
     rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.2)
     serverspec (2.41.5)
       multi_json
       rspec (~> 3.0)
       rspec-its
       specinfra (~> 2.72)
     sfl (2.3)
-    specinfra (2.82.4)
+    specinfra (2.82.5)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
@@ -44,4 +44,4 @@ DEPENDENCIES
   serverspec
 
 BUNDLED WITH
-   2.1.2
+   2.1.3

From f7459f50fee1149c0a0c0f05272d031ace5f014a Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Thu, 2 Jan 2020 16:45:06 +0100
Subject: [PATCH 25/38] #166: Make tests pass

---
 tests/spec/default/cli.rb  | 10 ++++------
 tests/spec/default/ruby.rb |  9 ++++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests/spec/default/cli.rb b/tests/spec/default/cli.rb
index c97a1db..dc008e5 100644
--- a/tests/spec/default/cli.rb
+++ b/tests/spec/default/cli.rb
@@ -30,11 +30,10 @@
       it { should be_installed }
     end
 
-    describe command('ls -lah /home/vagrant/.gem/ruby/2.5.0/gems/') do
-       its(:stdout) { should match /capistrano-3\.\d+\.\d+/ }
-       its(:stdout) { should match /sass-\d+\.\d+\.\d+/ }
-       its(:stdout) { should match /compass-core-\d+\.\d+\.\d+/ }
-       its(:stdout) { should match /bundler-\d+\.\d+\.\d+/ }
+    describe command('gem list') do
+       its(:stdout) { should match /capistrano \(3\.\d+\.\d+/ }
+       its(:stdout) { should match /sass \(\d+\.\d+\.\d+/ }
+       its(:stdout) { should match /bundler \(\d+\.\d+\.\d+/ }
     end
 
     describe package('git') do
@@ -43,7 +42,6 @@
 
     describe file('/home/vagrant/.bashrc') do
        it { should exist }
-       its(:content) { should match '/home/vagrant/.gem/ruby/2.5.0/bin' }
        its(:content) { should match '/home/vagrant/.composer/vendor/bin' }
        its(:content) { should match '/home/vagrant/box' }
        its(:content) { should match '/home/vagrant/phpmanager' }
diff --git a/tests/spec/default/ruby.rb b/tests/spec/default/ruby.rb
index a3eb083..447e26c 100644
--- a/tests/spec/default/ruby.rb
+++ b/tests/spec/default/ruby.rb
@@ -1,13 +1,16 @@
 require 'spec_helper'
 
-rvm_default_ruby = 'ruby-2.5.1'
-
 describe '## Ruby' do
 
     let(:sudo_options) { '-u vagrant -i' }
 
     describe command("ruby --version") do
-      its(:stdout) { should match rvm_default_ruby.split('-')[-1].to_s }
+      its(:stdout) { should match '2.6.5' }
+    end
+
+    describe file("/etc/profile.d/rbenv.sh") do
+        it { should exist }
+        its(:content) { should match 'rbenv init' }
     end
 
 end
\ No newline at end of file

From 1cb65391ad6fcbe5b58fda914ac8edb5e8ab1d42 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Thu, 2 Jan 2020 17:16:41 +0100
Subject: [PATCH 26/38] #158: Fix wetty install

---
 puppet/environments/box/modules/profiles/manifests/wetty.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/puppet/environments/box/modules/profiles/manifests/wetty.pp b/puppet/environments/box/modules/profiles/manifests/wetty.pp
index b347591..2ffb684 100644
--- a/puppet/environments/box/modules/profiles/manifests/wetty.pp
+++ b/puppet/environments/box/modules/profiles/manifests/wetty.pp
@@ -3,9 +3,9 @@
     include ::profiles::nodejs
 
     include ::profiles::systemd::reload
-
+  
     exec { 'yarn-install-wetty':
-        command     => '/usr/bin/yarn global add wetty.js',
+        command     => '/usr/bin/yarn global add wetty',
         unless      => 'which wetty',
         notify      => Service['wetty'],
         require     => Package['yarn']

From b2b551f9f326220c110081b82a96e7bebe1246f4 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Thu, 2 Jan 2020 17:21:59 +0100
Subject: [PATCH 27/38] #158: Fix wetty ServerSpec test

---
 tests/spec/default/misc.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/spec/default/misc.rb b/tests/spec/default/misc.rb
index 79d8e97..6aa91f3 100644
--- a/tests/spec/default/misc.rb
+++ b/tests/spec/default/misc.rb
@@ -34,7 +34,7 @@
 
         describe command('sudo yarn global list') do
           its(:exit_status) { should eq 0 }
-          its(:stdout) { should match /wetty.js@\d\.\d+\.\d+/ }
+          its(:stdout) { should match /wetty@\d\.\d+\.\d+/ }
         end
 
         describe file('/etc/apache2/joomla.box-include.conf') do

From a4cc99cc14c4f86d788a1887c7e9a0b7086368ea Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Thu, 2 Jan 2020 17:55:23 +0100
Subject: [PATCH 28/38] #158: Update CHANGELOG

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3566e52..6aa0daa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,9 +13,10 @@ To view the diff between two versions, go to https://github.com/joomlatools/joom
   * 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)
+  * 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)

From e35ec4aea6e8886aaea4c2025aa07a6675508219 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Fri, 10 Jan 2020 15:41:20 +0100
Subject: [PATCH 29/38] Revert "Revert "#158, #138: Update Node to 12.x""

This reverts commit 74ae57a8
---
 puppet/environments/box/modules/profiles/manifests/nodejs.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/puppet/environments/box/modules/profiles/manifests/nodejs.pp b/puppet/environments/box/modules/profiles/manifests/nodejs.pp
index c838af7..b4c940f 100644
--- a/puppet/environments/box/modules/profiles/manifests/nodejs.pp
+++ b/puppet/environments/box/modules/profiles/manifests/nodejs.pp
@@ -3,7 +3,7 @@
 ) {
 
   class { '::nodejs':
-    repo_url_suffix => '10.x',
+    repo_url_suffix => '12.x',
   }
 
 }
\ No newline at end of file

From aaeeaf1ed505f985f22f6b9d10c1284dc84e37a2 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Fri, 10 Jan 2020 16:47:15 +0100
Subject: [PATCH 30/38] #158: Fix Cockpit install

---
 .../box/modules/profiles/manifests/box/cockpit.pp    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp b/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp
index 7b4841f..801f028 100644
--- a/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp
+++ b/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp
@@ -1,5 +1,9 @@
 class profiles::box::cockpit {
 
+  file { ['/etc/cockpit', '/etc/cockpit/ws-certs.d']:
+    ensure => directory
+  }
+
   package { 'cockpit': }
 
   ini_setting { 'Cockpit LoginTitle':
@@ -9,7 +13,7 @@
     setting   => 'LoginTitle',
     value     => $::fqdn,
     show_diff => true,
-    require => Package['cockpit'],
+    require => File['/etc/cockpit'],
     notify => Service['cockpit']
   }
 
@@ -20,7 +24,7 @@
     setting   => 'MaxStartups',
     value     => 10,
     show_diff => true,
-    require => Package['cockpit'],
+    require => File['/etc/cockpit'],
     notify => Service['cockpit']
   }
 
@@ -31,13 +35,13 @@
     setting   => 'AllowUnencrypted',
     value     => true,
     show_diff => true,
-    require => Package['cockpit'],
+    require => File['/etc/cockpit'],
     notify => Service['cockpit']
   }
 
   service { 'cockpit':
     ensure => 'running',
     enable => true,
-    require => Package['cockpit']
+    require => [Package['cockpit'], File['/etc/cockpit/ws-certs.d']
   }
 }
\ No newline at end of file

From 70abc53c1ae1193be4d10f8482106d08ed1d1e28 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Fri, 10 Jan 2020 17:37:16 +0100
Subject: [PATCH 31/38] #158: Ensure we install latest version of Cockpit

---
 .../modules/profiles/manifests/box/cockpit.pp  |  8 ++++++--
 tests/spec/default/cockpit.rb                  | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 tests/spec/default/cockpit.rb

diff --git a/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp b/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp
index 801f028..46b063d 100644
--- a/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp
+++ b/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp
@@ -4,7 +4,10 @@
     ensure => directory
   }
 
-  package { 'cockpit': }
+  package { ['cockpit', 'cockpit-ws', 'cockpit-bridge', 'cockpit-dashboard', 'cockpit-networkmanager', 'cockpit-packagekit', 'cockpit-storaged', 'cockpit-system']:
+    ensure => '210-1~ubuntu18.04.1',
+    notify => Service['cockpit']
+  }
 
   ini_setting { 'Cockpit LoginTitle':
     ensure    => present,
@@ -42,6 +45,7 @@
   service { 'cockpit':
     ensure => 'running',
     enable => true,
-    require => [Package['cockpit'], File['/etc/cockpit/ws-certs.d']
+    require => [Package['cockpit'], File['/etc/cockpit/ws-certs.d']]
   }
+
 }
\ No newline at end of file
diff --git a/tests/spec/default/cockpit.rb b/tests/spec/default/cockpit.rb
new file mode 100644
index 0000000..b0fca52
--- /dev/null
+++ b/tests/spec/default/cockpit.rb
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe '## Cockpit' do
+    describe service('cockpit'), :if => os[:family] == 'ubuntu' do
+      it { should be_enabled }
+      it { should be_running }
+    end
+
+    describe port(9090) do
+      it { should be_listening }
+    end
+
+    describe file('/etc/cockpit/cockpit.conf') do
+      it { should exist }
+      its(:content) { should match /joomlatools.box/ }
+      its(:content) { should match /AllowUnencrypted = true/ }
+    end
+end
\ No newline at end of file

From b809b6a6f83ede216bef3fc7ed356a9cfc3caf6f Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Fri, 10 Jan 2020 18:02:19 +0100
Subject: [PATCH 32/38] #158: Automatically log in into Cockpit

---
 .../profiles/files/cockpit/login.min.html     | 776 ++++++++++++++++++
 .../modules/profiles/manifests/box/cockpit.pp |   8 +-
 2 files changed, 783 insertions(+), 1 deletion(-)
 create mode 100644 puppet/environments/box/modules/profiles/files/cockpit/login.min.html

diff --git a/puppet/environments/box/modules/profiles/files/cockpit/login.min.html b/puppet/environments/box/modules/profiles/files/cockpit/login.min.html
new file mode 100644
index 0000000..3819611
--- /dev/null
+++ b/puppet/environments/box/modules/profiles/files/cockpit/login.min.html
@@ -0,0 +1,776 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Loading...</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="robots" content="noindex">
+    <meta insert_dynamic_content_here>
+    <script>
+        /* global XMLHttpRequest */
+        (function(a) {
+            var r;
+            /* Some browsers fail localStorage access due to corruption, preventing Cockpit login */    try {
+                r = window.localStorage;
+                window.localStorage.removeItem("url-root");
+                window.localStorage.removeItem("standard-login");
+            } catch (e) {
+                r = window.sessionStorage;
+                a.warn(String(e));
+            }
+            var s;
+            var l = window.environment || {};
+            var u = l.OAuth || null;
+            if (u) {
+                if (!u.TokenParam) u.TokenParam = "access_token";
+                if (!u.ErrorParam) u.ErrorParam = "error_description";
+            }
+            var t = /\$\{([^}]+)\}|\$([a-zA-Z0-9_]+)/g;
+            function d(e /* ... */) {
+                var o = Array.prototype.slice.call(arguments, 1);
+                return e.replace(t, function(e, t, n) {
+                    return o[t || n] || "";
+                });
+            }
+            function n(e) {
+                if (window.cockpit_po) {
+                    var t = window.cockpit_po[e];
+                    if (t && t[1]) return t[1];
+                }
+                return e;
+            }
+            function c() {
+                if (!document.querySelectorAll) return;
+                var e = document.querySelectorAll("[translate]");
+                for (var t = 0; t < e.length; t++) e[t].textContent = n(e[t].textContent);
+            }
+            var f = n;
+            var p, g, w, v;
+            var o = /[?&]?([^=]+)=([^&]*)/g;
+            var m = null;
+            function y(e) {
+                e = e.split("+").join(" ");
+                var t = {};
+                var n;
+                for (;;) {
+                    n = o.exec(e);
+                    if (!n) break;
+                    t[decodeURIComponent(n[1])] = decodeURIComponent(n[2]);
+                }
+                return t;
+            }
+            if (!a) a = function() {};
+            function h(e) {
+                return document.getElementById(e);
+            }
+            function b(e) {
+                if (window.console) a.warn("fatal:", e);
+                h("login-again").style.display = "none";
+                h("login-wait-validating").style.display = "none";
+                if (m) {
+                    h("login-again").href = m;
+                    h("login-again").style.display = "block";
+                }
+                h("login").style.display = "none";
+                h("login-details").style.display = "none";
+                h("login-fatal").style.display = "block";
+                var t = h("login-fatal-message");
+                t.textContent = "";
+                t.appendChild(document.createTextNode(e));
+            }
+            function k(e, t) {
+                var n;
+                var o = h(e);
+                if (o && window.getComputedStyle) n = window.getComputedStyle(o, ":before");
+                if (!n) return;
+                var i;
+                var r = n.content;
+                if (r && r != "none" && r != "normal") {
+                    i = r.length;
+                    if ((r[0] === '"' || r[0] === "'") && i > 2 && r[i - 1] === r[0]) r = r.substr(1, i - 2);
+                    o.innerHTML = r || t;
+                } else {
+                    o.removeAttribute("class");
+                }
+            }
+            function x() {
+                function o(e) {
+                    if (window.console) a.warn(d(f("This web browser is too old to run Cockpit (missing $0)"), e));
+                    h("login").style.display = "none";
+                    h("login-details").style.display = "none";
+                    h("unsupported-browser").style.display = "block";
+                    document.body.className += " brand-unsupported-browser";
+                }
+                function e(t, e) {
+                    var n;
+                    try {
+                        n = e[t];
+                    } catch (e) {
+                        b(d(f("The web browser configuration prevents Cockpit from running (inaccessible $0)"), t));
+                        throw e;
+                    }
+                    if (n === undefined) {
+                        o();
+                        return false;
+                    }
+                    return true;
+                }
+                function t() {
+                    /*
+                     * Be certain to use parenthesis when checking CSS strings
+                     * as Edge is oddly particular.
+                     *
+                     * Instead of "display: inline", use:
+                     * "(display: inline)"
+                     *        or
+                     * "display", "inline"
+                     */
+                    var e = [].join.call(arguments, ": ");
+                    if (!window.CSS.supports.apply(this, arguments)) {
+                        b(d(f("The web browser configuration prevents Cockpit from running (inaccessible $0)"), e));
+                        o(e);
+                        return false;
+                    }
+                    return true;
+                }
+                return ("MozWebSocket" in window || e("WebSocket", window)) && e("XMLHttpRequest", window) && e("sessionStorage", window) && e("JSON", window) && e("defineProperty", Object) && e("console", window) && e("pushState", window.history) && e("textContent", document) && e("CSS", window) && e("supports", window.CSS) && t("display", "flex") && t("display", "grid");
+            }
+            function S(e) {
+                return e.replace(/^\s+|\s+$/g, "");
+            }
+            /* Sets values for application, url_root and login_path */    function C(e) {
+                var t = document.createElement("a");
+                var n = document.baseURI;
+                var o;
+                /* Some IEs don't support baseURI */        if (!n) {
+                    o = document.getElementsByTagName("base");
+                    if (o.length > 0) n = o[0].href; else n = "/";
+                }
+                e = e || "/";
+                t.href = n;
+                if (t.pathname != "/") {
+                    s = t.pathname.replace(/^\/+|\/+$/g, "");
+                    r.setItem("url-root", s);
+                    if (s && e.indexOf("/" + s) === 0) e = e.replace("/" + s, "") || "/";
+                }
+                if (e.indexOf("/=") === 0) {
+                    l.hostname = e.substring(2);
+                    e = "/cockpit+" + e.split("/")[1];
+                } else if (e.indexOf("/cockpit/") !== 0 && e.indexOf("/cockpit+") !== 0) {
+                    e = "/cockpit";
+                }
+                g = e.split("/")[1];
+                p = "/" + g + "/login";
+                if (s) p = "/" + s + p;
+                v = g;
+                w = p;
+            }
+            function T(e, t) {
+                // On keypress, only accept spacebar (enter acts as a click)
+                if (e && e.type === "keypress" && e.key !== " ") return;
+                // Stop the <a>'s click handler, otherwise it causes a page reload
+                if (e && e.type === "click") e.preventDefault();
+                if (t === undefined) t = h("server-group").style.display === "none";
+                h("option-group").setAttribute("data-state", t);
+                if (t) {
+                    h("server-group").style.display = "block";
+                    h("option-caret").setAttribute("class", "caret caret-down");
+                    h("option-caret").setAttribute("className", "caret caret-down");
+                } else {
+                    h("server-group").style.display = "none";
+                    h("option-caret").setAttribute("class", "caret caret-right");
+                    h("option-caret").setAttribute("className", "caret caret-right");
+                }
+            }
+            function e() {
+                window.onload = null;
+                c();
+                C(window.location.pathname);
+                /* Determine if we are nested or not, and switch styles */        if (window.location.pathname.indexOf("/" + s + "/cockpit/") === 0 || window.location.pathname.indexOf("/" + s + "/cockpit+") === 0) document.documentElement.setAttribute("class", "inline");
+                // Setup title
+                var e = l.page.title;
+                if (!e || g.indexOf("cockpit+=") === 0) e = l.hostname;
+                document.title = e;
+                if (g.indexOf("cockpit+=") === 0) {
+                    h("brand").style.display = "none";
+                    h("badge").style.visibility = "hidden";
+                } else {
+                    k("badge", "");
+                    k("brand", "Cockpit");
+                }
+                if (!x()) return;
+                if (l.banner) {
+                    h("banner").classList.remove("group-hidden");
+                    h("banner-message").textContent = l.banner.trimEnd();
+                }
+                h("show-other-login-options").addEventListener("click", T);
+                h("show-other-login-options").addEventListener("keypress", T);
+                h("server-clear").addEventListener("click", function() {
+                    var e = h("server-field");
+                    e.value = "";
+                    e.focus();
+                });
+                /* Setup the user's last choice about the authorized button */        var t = r.getItem("authorized-default");
+                if (t === null || t.indexOf("password") !== -1) h("authorized-input").checked = true;
+                var n = l["os-release"];
+                if (n) r.setItem("os-release", JSON.stringify(n));
+                var o = window.sessionStorage.getItem("logout-intent") == "explicit";
+                if (o) window.sessionStorage.removeItem("logout-intent");
+                var i = window.sessionStorage.getItem("logout-reason");
+                if (i) window.sessionStorage.removeItem("logout-reason");
+                /* Try automatic/kerberos authentication? */        if (u) {
+                    h("login-details").style.display = "none";
+                    h("login").style.display = "none";
+                    if (o) {
+                        L();
+                        h("login-again").textContent = f("Login Again");
+                        b(f("Logout Successful"));
+                    } else {
+                        O();
+                    }
+                } else if (o) {
+                    q(i);
+                } else {
+                    I();
+                }
+            }
+            function I() {
+                var e = new XMLHttpRequest();
+                e.open("GET", p, true);
+                e.onreadystatechange = function() {
+                    if (e.readyState == 4) {
+                        if (e.status == 200) {
+                            D(JSON.parse(e.responseText));
+                        } else if (e.status == 401) {
+                            q();
+                        } else if (e.statusText) {
+                            b(decodeURIComponent(e.statusText));
+                        } else if (e.status === 0) {
+                            q();
+                        } else {
+                            b(d(f("$0 error"), e.status));
+                        }
+                    }
+                };
+                e.send();
+            }
+            function L() {
+                var e = window.location.href.split("#", 2);
+                m = u.URL;
+                if (u.URL.indexOf("?") > -1) m += "&"; else m += "?";
+                m += "redirect_uri=" + encodeURIComponent(e[0]);
+            }
+            function O() {
+                var e = document.createElement("a");
+                if (!u.URL) return b(f("Cockpit authentication is configured incorrectly."));
+                var t = y(window.location.search);
+                if (!window.location.search && window.location.hash) t = y(window.location.hash.slice(1));
+                /* Not all providers allow hashes in redirect urls */        var n, o, i;
+                L();
+                if (t[u.TokenParam]) {
+                    if (window.sessionStorage.getItem("login-wanted")) {
+                        e.href = window.sessionStorage.getItem("login-wanted");
+                        C(e.pathname);
+                    }
+                    n = t[u.TokenParam];
+                    h("login-wait-validating").style.display = "block";
+                    i = new XMLHttpRequest();
+                    i.open("GET", p, true);
+                    i.setRequestHeader("Authorization", "Bearer " + n);
+                    i.onreadystatechange = function() {
+                        if (i.readyState == 4) {
+                            if (i.status == 200) {
+                                D(JSON.parse(i.responseText));
+                            } else {
+                                o = W(i.getResponseHeader("WWW-Authenticate"), i.responseText);
+                                if (o) $(o); else b(decodeURIComponent(i.statusText));
+                            }
+                        }
+                    };
+                    i.send();
+                } else if (t[u.ErrorParam]) {
+                    b(t[u.ErrorParam]);
+                } else {
+                    /* Store url we originally wanted in case we
+                     * had to strip a hash or query params
+                     */
+                    window.sessionStorage.setItem("login-wanted", window.location.href);
+                    window.location = m;
+                }
+            }
+            function i() {
+                h("error-group").classList.add("group-hidden");
+                h("login-error-message").textContent = "";
+            }
+            function E() {
+                h("info-group").classList.add("group-hidden");
+                h("login-info-message").textContent = "";
+            }
+            function A(e, t) {
+                i();
+                if (e) {
+                    /* OAuth failures are always fatal */
+                    if (u) {
+                        b(e);
+                    } else {
+                        P(t);
+                        h("login-error-message").textContent = e;
+                        h("error-group").classList.remove("group-hidden");
+                    }
+                }
+            }
+            function R(e) {
+                E();
+                if (e) {
+                    h("login-info-message").textContent = e;
+                    h("info-group").classList.remove("group-hidden");
+                }
+            }
+            function U(e) {
+                var t = h("server-field").value;
+                if (!t) {
+                    A(e, false);
+                } else {
+                    i();
+                    h("login-error-message").textContent = e;
+                    h("error-group").classList.remove("group-hidden");
+                    T(null, true);
+                    P();
+                }
+            }
+            function H(e) {
+                var t = h("login-note");
+                if (e) {
+                    t.style.display = "block";
+                    t.textContent = e;
+                } else {
+                    t.innerHTML = "&nbsp;";
+                }
+            }
+            function N() {
+                return l.page.require_host && v.indexOf("cockpit+=") === -1;
+            }
+            function z() {
+                A(null);
+                var e;
+                var t = S(h("login-user-input").value);
+                if (t === "") {
+                    A(f("User name cannot be empty"));
+                } else if (N() && h("server-field").value === "") {
+                    A(f("Please specify the host to connect to"));
+                } else {
+                    e = h("server-field").value;
+                    if (e) {
+                        g = "cockpit+=" + e;
+                        p = w.replace("/" + v + "/", "/" + g + "/");
+                    } else {
+                        g = v;
+                        p = w;
+                    }
+                    h("server-name").textContent = e || l.hostname;
+                    h("login-button").removeEventListener("click", z);
+                    /* When checked we tell the server to keep authentication */            var n = h("authorized-input").checked ? "password" : "";
+                    var o = h("login-password-input").value;
+                    r.setItem("authorized-default", n);
+                    /* Keep information if login page was used */            r.setItem("standard-login", true);
+                    var i = {
+                        Authorization: "Basic " + window.btoa(J(t + ":" + o)),
+                        "X-Authorize": n
+                    };
+                    // allow unknown remote hosts with interactive logins with "Connect to:"
+                    if (e) i["X-SSH-Connect-Unknown-Hosts"] = "yes";
+                    M("GET", i, false);
+                }
+            }
+            function P(e) {
+                var t = l.page.connect;
+                var n = h("option-group").getAttribute("data-state");
+                h("login-wait-validating").style.display = "none";
+                h("login").style.visibility = "visible";
+                h("login").style.display = "block";
+                h("user-group").style.display = e ? "none" : "block";
+                h("password-group").style.display = e ? "none" : "block";
+                h("conversation-group").style.display = e ? "block" : "none";
+                h("login-button-text").textContent = f("Log In");
+                h("login-password-input").value = "";
+                if (N()) {
+                    h("option-group").style.display = "none";
+                    n = true;
+                } else {
+                    h("option-group").style.display = !t || e ? "none" : "block";
+                }
+                if (!t || e) {
+                    h("server-group").style.display = "none";
+                } else {
+                    h("server-group").style.display = n ? "block" : "none";
+                }
+                h("login-button").removeAttribute("disabled");
+                if (!e) h("login-button").addEventListener("click", z);
+            }
+            function q(e) {
+                /* Show the login screen */
+                R(e);
+                h("server-name").textContent = document.title;
+                H(f("Log in with your server user account."));
+                h("login-user-input").addEventListener("keydown", function(e) {
+                    A(null);
+                    E();
+                    if (e.which == 13) h("login-password-input").focus();
+                }, false);
+                var t = function(e) {
+                    A(null);
+                    if (e.which == 13) z();
+                };
+                h("login-password-input").addEventListener("keydown", t);
+                h("authorized-input").addEventListener("keydown", t);
+                P();
+                h("login-user-input").focus();
+            }
+            function $(e) {
+                var t = e.echo ? "text" : "password";
+                h("conversation-prompt").textContent = e.prompt;
+                var n = h("conversation-message");
+                var o = e.error || e.message;
+                if (o) {
+                    n.textContent = o;
+                    n.style.display = "block";
+                } else {
+                    n.style.display = "none";
+                }
+                var i = h("conversation-input");
+                i.value = "";
+                if (e.default) i.value = e.default;
+                i.setAttribute("type", t);
+                A("");
+                function r() {
+                    h("conversation-input").removeEventListener("keydown", s);
+                    h("login-button").removeEventListener("click", r);
+                    A(null, true);
+                    X(e.id, h("conversation-input").value);
+                }
+                function s(e) {
+                    A(null, true);
+                    if (e.which == 13) {
+                        r();
+                    }
+                }
+                h("conversation-input").addEventListener("keydown", s);
+                h("login-button").addEventListener("click", r);
+                P(true);
+                i.focus();
+            }
+            function J(e) {
+                return window.unescape(encodeURIComponent(e));
+            }
+            function W(e, t) {
+                var n;
+                var o;
+                var i;
+                var r;
+                if (!e) return null;
+                n = e.split(" ");
+                if (n[0].toLowerCase() !== "x-conversation" && n.length != 3) return null;
+                r = n[1];
+                try {
+                    o = window.atob(n[2]);
+                } catch (e) {
+                    if (window.console) a.error("Invalid prompt data", e);
+                    return null;
+                }
+                try {
+                    i = JSON.parse(t);
+                } catch (e) {
+                    if (window.console) a.log("Got invalid JSON response for prompt data", e);
+                    i = {};
+                }
+                i.id = r;
+                i.prompt = o;
+                return i;
+            }
+            function M(e, t, n) {
+                h("login-button").setAttribute("disabled", "true");
+                var o = new XMLHttpRequest();
+                o.open("GET", p, true);
+                var i;
+                var r;
+                var s;
+                for (s in t) o.setRequestHeader(s, t[s]);
+                o.onreadystatechange = function() {
+                    if (o.readyState != 4) {
+                        return;
+                    } else if (o.status == 200) {
+                        var e = JSON.parse(o.responseText);
+                        D(e);
+                    } else if (o.status == 401) {
+                        r = o.getResponseHeader("WWW-Authenticate");
+                        if (r && r.toLowerCase().indexOf("x-conversation") === 0) {
+                            i = W(r, o.responseText);
+                            if (i) $(i); else b(f("Internal Error: Invalid challenge header"));
+                        } else {
+                            if (window.console) a.log(o.statusText);
+                            if (o.statusText.indexOf("authentication-not-supported") > -1) {
+                                var t = S(h("login-user-input").value);
+                                b(d(f("The server refused to authenticate '$0' using password authentication, and no other supported authentication methods are available."), t));
+                            } else if (o.statusText.indexOf("terminated") > -1) {
+                                A(f("Authentication Failed: Server closed connection"));
+                            } else if (o.statusText.indexOf("no-host") > -1) {
+                                U(f("Unable to connect to that address"));
+                            } else if (o.statusText.indexOf("unknown-hostkey") > -1) {
+                                U(f("Refusing to connect. Hostkey is unknown"));
+                            } else if (o.statusText.indexOf("unknown-host") > -1) {
+                                U(f("Refusing to connect. Host is unknown"));
+                            } else if (o.statusText.indexOf("invalid-hostkey") > -1) {
+                                U(f("Refusing to connect. Hostkey does not match"));
+                            } else if (n) {
+                                A(f("Authentication failed"));
+                            } else {
+                                A(f("Wrong user name or password"));
+                            }
+                        }
+                    } else if (o.status == 403) {
+                        A(decodeURIComponent(o.statusText) || f("Permission denied"));
+                    } else if (o.statusText) {
+                        b(decodeURIComponent(o.statusText));
+                    } else {
+                        b(d(f("$0 error"), o.status));
+                    }
+                    h("login-button").removeAttribute("disabled");
+                };
+                o.send();
+            }
+            function X(e, t) {
+                var n = {
+                    Authorization: "X-Conversation " + e + " " + window.btoa(J(t))
+                };
+                M("GET", n, true);
+            }
+            function G(e) {
+                // Force a reload if not triggered below
+                // because only the hash part of the url
+                // changed
+                var t = window.setTimeout(function() {
+                    t = null;
+                    window.location.reload(true);
+                }, 100);
+                if (e && e != window.location.href) window.location = e;
+                // cancel forced reload if we are reloading
+                window.onbeforeunload = function() {
+                    if (t) window.clearTimeout(t);
+                    t = null;
+                };
+            }
+            function _(n) {
+                var e = "/" + g + "/@localhost/";
+                if (s) e = "/" + s + e;
+                var o = e + "shell/index.html";
+                var i = new XMLHttpRequest();
+                i.open("GET", e + "manifests.json", true);
+                i.onreadystatechange = function() {
+                    if (i.readyState == 4) {
+                        if (i.status == 200) {
+                            var e = JSON.parse(i.responseText);
+                            var t = e ? e.base1 : {};
+                            if (!t.version || t.version < "119.x") {
+                                G(o);
+                            } else G(n);
+                        } else {
+                            G(o);
+                        }
+                    }
+                };
+                i.send();
+            }
+            function j(e, t, n) {
+                var o = 0;
+                while (o < e.length) {
+                    var i = e.key(o);
+                    if (n && i.indexOf("cockpit") !== 0) e.removeItem(i); else if (i.indexOf(t) === 0) e.removeItem(i); else o++;
+                }
+            }
+            function B(e) {
+                /* Clear anything not prefixed with
+                 * different application from sessionStorage
+                 */
+                j(window.sessionStorage, g, true);
+                /* Clear anything prefixed with our application
+                 * and login-data, but not other non-application values.
+                 */        r.removeItem("login-data");
+                j(r, g, false);
+                var t;
+                if (e && e["login-data"]) {
+                    t = JSON.stringify(e["login-data"]);
+                    /* login-data is tied to the auth cookie, since
+                     * cookies are available after the page
+                     * session ends login-data should be too.
+                     */            r.setItem(g + "login-data", t);
+                    /* Backwards compatbility for packages that aren't application prefixed */            r.setItem("login-data", t);
+                }
+                /* URL Root is set by cockpit ws and shouldn't be prefixed
+                 * by application
+                 */        if (s) r.setItem("url-root", s);
+                var n = l.CACertUrl;
+                if (n) window.sessionStorage.setItem("CACertUrl", n);
+            }
+            function D(e) {
+                var t = window.sessionStorage.getItem("login-wanted");
+                var n = h("server-field").value;
+                if (n && g != v) {
+                    t = "/=" + n;
+                    if (s) t = "/" + s + t;
+                }
+                /* clean up sessionStorage. clear anything that isn't prefixed
+                 * with an application and anything prefixed with our application.
+                 */        j(window.sessionStorage, g, false);
+                B(e);
+                /* Make sure that the base1 version is new enough to handle
+                 * urls that reference machines.
+                 */        if (g.indexOf("cockpit+=") === 0) {
+                    _(t);
+                } else {
+                    G(t);
+                }
+            }
+            window.onload = e;
+        })(window.console);
+        //# sourceMappingURL=login.min.js.map    </script>
+    <style>
+        *,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;text-size-adjust:100%;-webkit-tap-highlight-color:transparent}body{margin:0;font-family:RedHatText,Helvetica,Arial,sans-serif;background-color:#333;color:#fff;line-height:1.5}.btn,label{font-weight:600}.btn,img{vertical-align:middle}#login-wait-validating div,.col-xs-12{float:left}#option-group,.btn,.cross,button{cursor:pointer}#option-group svg,.cross{opacity:.7}a{color:inherit;text-decoration:none}.btn:focus,a:focus{outline:-webkit-focus-ring-color auto 5px;outline:dotted thin;outline-offset:-2px}a:active,a:hover{outline:0}a:focus,a:hover{color:#fff;text-decoration:underline}img{border:0}button,input,select,textarea{font-family:inherit;margin:0;font-size:inherit;line-height:inherit}button{-webkit-appearance:button;overflow:visible}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}p{margin:0 0 10px}.container{margin-right:auto;margin-left:auto}#option-group{margin-top:2rem;margin-bottom:2rem}#server-group{margin-top:-1rem;margin-bottom:2rem}.container:after,.container:before,.form-group:after,.form-group:before,.row:after,.row:before{content:" ";display:table}.container:after,.row:after{clear:both}.col-lg-5,.col-lg-7,.col-md-10,.col-md-2,.col-md-6,.col-sm-1,.col-sm-10,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-5,.col-sm-6,.col-sm-7,.col-xs-12{position:relative;min-height:1px;padding-left:20px;padding-right:20px}.col-xs-12{width:100%}label{display:inline-block}#option-group,.control-label{font-size:.875rem}[role=form] .control-label,form .control-label{display:flex;align-items:center;min-height:2rem}.form-control{color:#151515}.form-control[type=password],.form-control[type=text]{display:block;width:100%;padding:.25rem .5rem;background-color:#fff;background-image:none;border:1px solid #ededed;border-bottom-color:#72767b;border-radius:1px;transition:border-color .15s ease-in-out;color:#151515}.form-control[type=password]:focus,.form-control[type=password]:hover,.form-control[type=text]:focus,.form-control[type=text]:hover{border-bottom-color:#06c}.form-control[type=password]:focus,.form-control[type=text]:focus{padding-bottom:calc(.25rem - 1px);border-bottom-width:2px}.form-control:focus{outline:0}.form-control:-moz-placeholder{color:#999;font-style:italic}.form-control::-moz-placeholder{color:#999;font-style:italic;opacity:1}.form-control:-ms-input-placeholder{color:#999;font-style:italic}.form-control::-webkit-input-placeholder{color:#999;font-style:italic}.checkbox-row{margin:1rem 0 0;display:flex;align-items:baseline}.checkbox-row>input[type=checkbox]{width:16px;height:16px;align-self:start;margin-top:calc((1.5rem - 16px)/ 2);margin-right:.5rem}label.checkbox{font:inherit}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}.btn,.caret{display:inline-block}#login-button[disabled] .spinner{display:inline-flex}.btn,.control-label{margin-bottom:0}.control-label{margin-top:0;padding-top:3px}.form-group:after{clear:both;margin-bottom:15px}.btn{text-align:center;background-image:none;border:1px solid transparent;white-space:nowrap;padding:2px 6px;border-radius:1px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.btn:focus,.btn:hover{color:#4d5258;text-decoration:none}.btn:active{outline:0;background-image:none}@-ms-viewport{width:device-width}.btn{padding:.25rem .5rem;border-radius:1px;font-size:inherit}.btn-primary{background-color:#06c;border-color:#06c;color:#fff}.btn-primary:active,.btn-primary:focus,.btn-primary:hover{background-color:#004080;border-color:#004080;color:#fff}.btn-primary:active{background-image:none}@font-face{font-family:RedHatText;font-style:normal;font-weight:400;src:url(cockpit/static/fonts/RedHatText-Regular.woff2) format('woff2')}@font-face{font-family:RedHatText;font-style:normal;font-weight:700;src:url(cockpit/static/fonts/RedHatText-Medium.woff2) format('woff2')}.login-pf{height:100%}.login-pf #brand{position:relative;top:-70px}.login-pf #brand img{display:block;margin:0 auto;max-width:100%}.login-pf #badge{display:block;margin:20px auto 70px;position:relative;text-align:center}.login-pf #banner{margin-top:20px}.login-pf .container{background-color:rgba(255,255,255,.055);clear:right;padding-bottom:40px;padding-top:20px;width:auto}.login-pf .container .details p:first-child{border-top:1px solid #474747;padding-top:25px;margin-top:25px}.login-pf .container .details p{margin-bottom:2px}.login-pf .container .control-label{font-weight:600}.login-pf .container .help-block{color:#fff}.login-pf .container .form-group:last-child,.login-pf .container .form-group:last-child .help-block:last-child{margin-bottom:0}.spinner{-webkit-animation:.6s linear infinite rotation;animation:.6s linear infinite rotation;border-bottom:4px solid rgba(0,0,0,.25);border-left:4px solid rgba(0,0,0,.25);border-right:4px solid rgba(0,0,0,.25);border-radius:100%;border-top:4px solid rgba(0,0,0,.75);height:1.5rem;width:1.5rem;position:relative;margin:.25rem 1rem}.group-hidden{display:none!important}.pf-c-alert{color:#151515;position:relative;grid-template-columns:repeat(2,max-content) 1fr max-content;grid-template-rows:1fr auto;grid-template-areas:"icon title action" ". content content";background-color:#fff;margin:0 0 1.5rem;align-items:center;display:grid}.pf-c-alert.pf-m-inline{border:solid #ededed;border-width:1px 1px 1px 0}.pf-c-alert.pf-m-inline::before{position:absolute;top:-1px;bottom:-1px;left:0;width:3px;content:""}.pf-c-alert>svg{grid-area:icon;height:18px;width:18px;margin:1rem 0 1rem 1rem}.pf-c-alert__title{grid-area:title;font-size:1rem;margin:1rem;background-color:#fff}.pf-c-alert.pf-m-inline.pf-m-danger::before{background-color:#c9190b}.pf-c-alert.pf-m-danger>svg{color:#c9190b}.pf-c-alert.pf-m-danger .pf-c-alert__title{color:#a30000}.pf-c-alert.pf-m-inline.pf-m-info::before{background-color:#73bcf7}.pf-c-alert.pf-m-info>svg{color:#73bcf7}.pf-c-alert.pf-m-info .pf-c-alert__title{color:#004368}#server-group:before{clear:both;margin-top:5px}.login-fatal{font-size:130%}.unsupported-browser ul{color:#aaa;display:inline-block;margin:0 auto;text-align:left}.unsupported-browser a{color:#fff;font-weight:700;text-decoration:underline}.cross,.inline .container .help-block{color:#000}.login-browser-recommendations{margin-top:6rem}.caret,.server-box{position:relative}.conversation-prompt{white-space:normal;word-wrap:break-word}.control-label{white-space:nowrap}.spinner{border-color:rgba(255,255,255,.75) rgba(255,255,255,.25) rgba(255,255,255,.25)}#login-button .spinner,#login-button[disabled] #login-button-text,.hide-before:before{display:none}.inline #badge,.inline #brand,.inline #login-details{display:none}.inline body{background:0 0!important;color:#000}.caret{top:4px}.caret-down{-moz-transform:rotate(90deg);-webkit-transform:rotate(90deg);transform:rotate(90deg);-moz-transform-origin:8px 8px;-webkit-transform-origin:8px 8px;transform-origin:8px 8px}.cross{align-items:center;bottom:0;display:flex;font-size:14px;font-weight:700;justify-content:center;position:absolute;right:20px;top:0;width:2rem}#option-group:hover svg,.cross:hover{opacity:1}#option-group div{margin-left:-3px;margin-top:3px;margin-bottom:10px}#login-button{padding:7px}#login-button[disabled]{padding:0;background-color:#333;background-image:none;border-color:#555}@media (min-width:1024){.container{width:760px}.col-sm-1,.col-sm-10,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-5,.col-sm-6,.col-sm-7{float:left}.col-sm-12{width:100%}.col-sm-10{width:83.33333333333334%}.col-sm-7{width:58.333333333333336%}.col-sm-6{width:50%}.col-sm-5{width:41.66666666666667%}.col-sm-3{width:25%}.col-sm-2{width:16.666666666666664%}.col-sm-1{width:8.333333333333332%}.col-sm-offset-2{margin-left:16.666666666666664%}}@media (min-width:1024px){.container{width:980px}.col-md-10,.col-md-2,.col-md-6{float:left}.col-md-10{width:83.33333333333334%}.col-md-6{width:50%}.col-md-2{width:16.666666666666664%}}@media (min-width:1200px){.container{width:1180px}.col-lg-5,.col-lg-7{float:left}.col-lg-7{width:58.333333333333336%}.col-lg-5{width:41.66666666666667%}}@media (max-width:480px){.unsupported-browser .container>.row>.col-sm-12{position:static}.login-pf{display:flex;flex-direction:column-reverse;height:auto;position:relative}.row{display:flex;flex-direction:column}.login-pf .container{width:100%}.login-pf #badge{max-width:33vw;margin:3rem auto;height:8rem;padding:0;background-position:50% 100%}.container>.row>.col-sm-12{order:1;position:absolute;bottom:0;left:0;width:100%;text-align:center}.login-pf #brand{position:static;font-size:inherit;background-position:50% 50%}.details{text-align:center}}@media (min-width:481px){.brand-unsupported-browser #brand{margin-left:-40px;position:absolute;text-align:center;width:100%}.unsupported-browser{font-size:140%;margin-left:-30px;text-align:center}.unsupported-browser-heading{font-size:3rem;left:50%;margin:0 0 0 -32rem;position:absolute;text-align:center;top:-16rem;width:64rem}.login-browser-recommendations h3{font-weight:400;margin-top:0}}@media (min-width:1024px){.control-label{text-align:right}[role=form] .control-label,form .control-label{padding:0}.login-pf #brand img{margin:0;text-align:left}.login-pf #badge{float:right;margin-right:64px;margin-top:50px}.login-pf .container{bottom:13%;padding-left:80px;position:absolute;width:100%}.login-pf .container .login-area{border-right:1px solid #474747}.login-pf .container .details{padding-left:40px}.login-pf .container .details p:first-child{border-top:0;padding-top:0;margin-top:0}}@-webkit-keyframes rotation{from{-webkit-transform:rotate(0)}to{-webkit-transform:rotate(359deg)}}@keyframes rotation{from{transform:rotate(0)}to{transform:rotate(359deg)}}@supports (display:grid){[class*=col-]{padding:0}.col-sm-12{padding:3rem 3rem 0}.row{display:flex;flex-flow:column;margin:0}body.login-pf{color:#151515;display:grid;grid-template-areas:"alert" "login" "logo";grid-template-columns:1fr;grid-template-rows:minmax(min-content,max-content);background-position:0 0!important;height:100vh;grid-gap:0 4rem;padding:0}.login-pf .container .details p:first-child{border-top:0;padding-top:0;margin-top:0}.container>.row>.col-sm-12{order:inherit;position:static;text-align:left}.login-button{width:100%}.login-pf .container{position:static;background:#fff;color:#333;grid-area:login;margin:0;padding:0}.login-pf #badge{grid-area:logo;margin:0!important}.login-pf .container .login-area{border:none;width:auto;padding:0 3rem 1.5rem}.login-pf .container .details{padding:1.5rem 3rem;width:auto!important;background:#ededed}.login-pf #brand{font-size:1.75rem;line-height:1.3;padding:0 0 2rem;position:static;text-transform:initial}.unsupported-browser a,a{color:#06c}.unsupported-browser a:focus,.unsupported-browser a:hover,a:focus,a:hover{color:#004080}.caret polygon{fill:#06c}[role=form] .col-md-10,form .col-md-10{display:flex}.cross{right:0}@media (max-width:1023px){body.login-pf{justify-items:center;grid-gap:.5rem}#badge{background-position:center}}@media (min-width:1024px){.container::before{background:rgba(0,0,0,.3);content:"";position:absolute;height:100%;width:370px;top:0;left:0;z-index:-1}body.login-pf{grid-template-areas:". alert alert ." ". . . ." ". login logo ." ". . . . ";grid-template-rows:auto 1fr minmax(min-content,max-content) 1fr;grid-template-columns:minmax(0,2.125rem) 35rem 1fr minmax(0,2.125rem)}}body.login-pf.brand-unsupported-browser{grid-template-columns:auto 1fr;grid-template-rows:auto}.unsupported-browser{padding:2rem;margin:0;font-size:inherit}.unsupported-browser ul{color:#555;margin:0 0 2rem}.login-browser-recommendations{margin:0;display:flex;justify-content:space-around}}.dialog-error{grid-area:alert;margin:0}#banner-message{white-space:pre-wrap;max-height:12em;overflow:auto;padding:1.5em 1em;margin:0}
+        /*# sourceMappingURL=login.min.css.map */    </style>
+    <link href="cockpit/static/branding.css" type="text/css" rel="stylesheet">
+</head>
+<body class="login-pf">
+<div id="banner" class="pf-c-alert pf-m-info pf-m-inline dialog-error group-hidden" aria-label="inline danger alert">
+    <svg fill="currentColor" viewBox="0 0 448 512" aria-hidden="true"><path d="M224 512c35.32 0 63.97-28.65 63.97-64H160.03c0 35.35 28.65 64 63.97 64zm215.39-149.71c-19.32-20.76-55.47-51.99-55.47-154.29 0-77.7-54.48-139.9-127.94-155.16V32c0-17.67-14.32-32-31.98-32s-31.98 14.33-31.98 32v20.84C118.56 68.1 64.08 130.3 64.08 208c0 102.3-36.15 133.53-55.47 154.29-6 6.45-8.66 14.16-8.61 21.71.11 16.4 12.98 32 32.1 32h383.8c19.12 0 32-15.6 32.1-32 .05-7.55-2.61-15.27-8.61-21.71z"/></svg>
+    <pre id="banner-message" class="pf-c-alert__title"></pre>
+</div>
+
+<span id="badge">
+    </span>
+<div class="container">
+    <div class="row">
+        <div class="col-sm-12">
+            <div id="brand" class="hide-before">
+            </div><!--/#brand-->
+        </div><!--/.col-*-->
+
+        <div id="login" class="login-area" style="visibility: hidden;">
+            <div role="form">
+
+                <div id="error-group" class="pf-c-alert pf-m-danger pf-m-inline dialog-error group-hidden" aria-label="inline danger alert">
+                    <svg fill="currentColor" viewBox="0 0 512 512" aria-hidden="true"><path d="M504 256c0 136.997-111.043 248-248 248S8 392.997 8 256C8 119.083 119.043 8 256 8s248 111.083 248 248zm-248 50c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"/></svg>
+                    <h4 id="login-error-message" class="pf-c-alert__title"></h4>
+                </div>
+
+                <div id="info-group" class="pf-c-alert pf-m-info pf-m-inline dialog-error group-hidden" aria-label="inline danger alert">
+                    <svg fill="currentColor" viewBox="0 0 512 512" aria-hidden="true"><path d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 110c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z"/></svg>
+                    <h4 id="login-info-message" class="pf-c-alert__title"></h4>
+                </div>
+
+                <div id="conversation-group" class="form-group" hidden>
+                    <div id="conversation-message"></div>
+                    <label id="conversation-prompt" for="conversation-input"></label>
+                    <input type="password" class="form-control" id="conversation-input">
+                </div>
+
+                <div id="user-group" class="form-group">
+                    <label for="login-user-input" class="control-label" translate>User name</label>
+                    <input type="text" class="form-control" id="login-user-input" autocorrect="off" autocapitalize="none" autofocus>
+                </div>
+
+                <div id="password-group" class="form-group">
+                    <label for="login-password-input" class="control-label" translate>Password</label>
+                    <input type="password" class="form-control" id="login-password-input">
+                    <div class="checkbox-row">
+                        <input type="checkbox" class="form-control" id="authorized-input">
+                        <label for="authorized-input" class="checkbox" translate>Reuse my password for privileged tasks</label>
+                    </div>
+                </div>
+
+                <div id="option-group">
+                    <i id="option-caret" class="caret caret-right" aria-hidden="true">
+                        <svg height="16" width="16" viewBox="0 0 16 16">
+                            <polygon fill="#ffffff" points="4,0 4,14 12,7">
+                            </polygon>
+                        </svg>
+                    </i>
+                    <a href="#" id="show-other-login-options" translate>Other Options</a>
+                </div>
+
+                <div id="server-group" class="form-group" hidden>
+                    <label title="Log in to another system. Leave blank to log in to the local system." for="server-field" class="control-label" translate>Connect to</label>
+                    <div class="server-box">
+                        <input type="text" class="form-control" id="server-field">
+                        <span class="cross" id="server-clear" aria-hidden="true">&#x274c;</span>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <button class="btn btn-primary login-button" id="login-button" type="submit">
+                        <span class="spinner"></span>
+                        <span id="login-button-text" translate>Log In</span>
+                    </button>
+                </div>
+            </div>
+        </div><!--/.col-*-->
+
+        <div class="details" id="login-details">
+            <p>
+                <label class="control-label"><span translate>Server</span>: <b id="server-name"></b></label>
+            </p>
+            <p id="login-note" class="login-note"></p>
+        </div><!--/.col-*-->
+
+        <div class="" id="login-wait-validating" hidden>
+            <div class="col-sm-4">
+                <span class="help-block" translate>Validating authentication token</span>
+            </div>
+            <div class="col-sm-1">
+                <div class="spinner col-xs-15">
+                </div>
+            </div>
+        </div>
+
+        <div class="col-sm-12" id="login-fatal" hidden>
+            <span id="login-fatal-message"></span>
+            <a id="login-again" translate hidden>Try Again</a>
+        </div>
+
+        <div class="unsupported-browser col-sm-12" id="unsupported-browser" hidden>
+            <h2 classname="unsupported-browser-heading" translate>A modern browser is required for security, reliability, and performance.</h2>
+            <div class="login-browser-recommendations">
+                <div class="col-sm-6">
+                    <h3 translate>Download a new browser for free</h3>
+                    <ul>
+                        <li><a href="https://firefox.com/">Mozilla Firefox</a> / Linux, Windows, macOS</li>
+                        <li><a href="https://google.com/chrome">Google Chrome</a> / Linux, Windows, macOS</li>
+                    </ul>
+                </div>
+                <div class="col-sm-6">
+                    <h3 translate>Or use a bundled browser</h3>
+                    <ul>
+                        <li><a href="https://microsoftedge.com/">Microsoft Edge</a> / Windows 10+</li>
+                        <li><a href="https://apple.com/safari/">Apple Safari</a> / macOS</li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+
+    </div><!--/.row-->
+</div><!--/.container-->
+
+
+<script>
+// Auto-login on our Vagrant box
+document.addEventListener('DOMContentLoaded', function() {
+    setTimeout(function() {
+        document.getElementById('login-user-input').value = 'vagrant';
+        document.getElementById('login-password-input').value = 'vagrant';
+
+        document.getElementById('login-button').click();
+    }, 1000);
+});
+</script>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp b/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp
index 46b063d..c233bd1 100644
--- a/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp
+++ b/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp
@@ -6,7 +6,7 @@
 
   package { ['cockpit', 'cockpit-ws', 'cockpit-bridge', 'cockpit-dashboard', 'cockpit-networkmanager', 'cockpit-packagekit', 'cockpit-storaged', 'cockpit-system']:
     ensure => '210-1~ubuntu18.04.1',
-    notify => Service['cockpit']
+    notify => [Service['cockpit'], File['/usr/share/cockpit/static/login.min.html']]
   }
 
   ini_setting { 'Cockpit LoginTitle':
@@ -48,4 +48,10 @@
     require => [Package['cockpit'], File['/etc/cockpit/ws-certs.d']]
   }
 
+  file { '/usr/share/cockpit/static/login.min.html':
+    ensure  => file,
+    source  => "puppet:///modules/profiles/cockpit/login.min.html",
+    notify  => Service['cockpit']
+  }
+
 }
\ No newline at end of file

From e48ffaddc04d4c30e6d8709cba57025d6902d451 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Mon, 20 Jan 2020 17:11:53 +0100
Subject: [PATCH 33/38] #158: Ensure Cockpit service is running and remove
 syslog from PimpMyLog

---
 README.md                                     |  2 +-
 packer/scripts/serverspec.sh                  |  2 +-
 .../files/box/scripts/data/navigation.php     |  2 +-
 .../config/config.user.d/syslog.json          | 26 -------------------
 .../modules/profiles/manifests/box/cockpit.pp |  8 +++---
 .../modules/profiles/manifests/pimpmylog.pp   |  7 -----
 .../box/modules/profiles/manifests/ruby.pp    | 10 ++++++-
 tests/spec/default/cockpit.rb                 |  2 +-
 tests/spec/default/misc.rb                    |  8 +-----
 9 files changed, 19 insertions(+), 48 deletions(-)
 delete mode 100644 puppet/environments/box/modules/profiles/files/pimpmylog/config/config.user.d/syslog.json

diff --git a/README.md b/README.md
index eb9b3f4..7f0de79 100644
--- a/README.md
+++ b/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
 
diff --git a/packer/scripts/serverspec.sh b/packer/scripts/serverspec.sh
index 3be105e..051783e 100644
--- a/packer/scripts/serverspec.sh
+++ b/packer/scripts/serverspec.sh
@@ -4,7 +4,7 @@ set -e
 
 export PATH=$PATH:/home/vagrant/.gem/ruby/2.5.0/bin/
 
-sudo gem install bundler --no-ri --no-rdoc
+sudo gem install bundler --no-document
 
 cd /tmp/tests
 
diff --git a/puppet/environments/box/modules/profiles/files/box/scripts/data/navigation.php b/puppet/environments/box/modules/profiles/files/box/scripts/data/navigation.php
index f82947d..66eb55c 100644
--- a/puppet/environments/box/modules/profiles/files/box/scripts/data/navigation.php
+++ b/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';
diff --git a/puppet/environments/box/modules/profiles/files/pimpmylog/config/config.user.d/syslog.json b/puppet/environments/box/modules/profiles/files/pimpmylog/config/config.user.d/syslog.json
deleted file mode 100644
index 765d207..0000000
--- a/puppet/environments/box/modules/profiles/files/pimpmylog/config/config.user.d/syslog.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "syslog": {
-    "display": "syslog",
-    "tags": ["System Logs"],
-    "path": "/var/log/syslog",
-    "refresh": 10,
-    "max": 50,
-    "format": {
-      "regex": "|(.*?) ([0-9]{1,2}) ([0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}) ([a-zA-Z0-9_\\-\\.]{1,256}) ([A-Za-z0-9_\\-\/\\.]{1,32})\\[(.*?)\\]:(.*)|",
-      "match": {
-        "Date": 3,
-        "Source": 4,
-        "Tag_ID": 5,
-        "PID": 6,
-        "Message": 7
-      },
-      "types": {
-        "Date": "date:H:i:s",
-        "Source": "txt",
-        "Tag_ID": "txt",
-        "PID": "numeral",
-        "Message": "txt"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp b/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp
index c233bd1..913c1d1 100644
--- a/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp
+++ b/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp
@@ -43,9 +43,11 @@
   }
 
   service { 'cockpit':
-    ensure => 'running',
-    enable => true,
-    require => [Package['cockpit'], File['/etc/cockpit/ws-certs.d']]
+    name     => 'cockpit.socket',
+    ensure   => 'running',
+    enable   => true,
+    provider => 'systemd',
+    require  => [Package['cockpit'], File['/etc/cockpit/ws-certs.d']]
   }
 
   file { '/usr/share/cockpit/static/login.min.html':
diff --git a/puppet/environments/box/modules/profiles/manifests/pimpmylog.pp b/puppet/environments/box/modules/profiles/manifests/pimpmylog.pp
index 64b01fd..20422e9 100644
--- a/puppet/environments/box/modules/profiles/manifests/pimpmylog.pp
+++ b/puppet/environments/box/modules/profiles/manifests/pimpmylog.pp
@@ -66,11 +66,4 @@
       mode    => '0644'
     }
 
-    file { '/var/log/syslog':
-      ensure => file,
-      mode   => '0644',
-      owner  => syslog,
-      group  => adm
-    }
-
 }
diff --git a/puppet/environments/box/modules/profiles/manifests/ruby.pp b/puppet/environments/box/modules/profiles/manifests/ruby.pp
index 2636e23..5e52246 100644
--- a/puppet/environments/box/modules/profiles/manifests/ruby.pp
+++ b/puppet/environments/box/modules/profiles/manifests/ruby.pp
@@ -2,10 +2,18 @@
   $version = '2.6.5'
 ) {
 
+  Package <| title == 'git' |>
+    -> Exec <| title == 'git-clone-rbenv' |>
+    -> Rbenv::Plugin <| |>
+    -> Rbenv::Gem <| |>
+
+  Package <| title == 'git' |>
+    -> Rbenv::Plugin <| |>
+
   class { '::rbenv': }
 
   rbenv::plugin { 'rbenv/ruby-build':
-    latest => true
+    latest  => true
   }
 
   rbenv::build { $version:
diff --git a/tests/spec/default/cockpit.rb b/tests/spec/default/cockpit.rb
index b0fca52..65027bf 100644
--- a/tests/spec/default/cockpit.rb
+++ b/tests/spec/default/cockpit.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe '## Cockpit' do
-    describe service('cockpit'), :if => os[:family] == 'ubuntu' do
+    describe service('cockpit.socket'), :if => os[:family] == 'ubuntu' do
       it { should be_enabled }
       it { should be_running }
     end
diff --git a/tests/spec/default/misc.rb b/tests/spec/default/misc.rb
index 6aa91f3..d330ab4 100644
--- a/tests/spec/default/misc.rb
+++ b/tests/spec/default/misc.rb
@@ -52,17 +52,11 @@
             its(:content) { should match /pimpmylog/ }
         end
 
-        ['apache2', 'mysql', 'syslog'].each do |conf|
+        ['apache2', 'mysql'].each do |conf|
             describe file("/usr/share/pimpmylog/config.user.d/#{conf}.json") do
                 it { should exist }
             end
         end
-
-        ['/var/log/syslog'].each do |log|
-            describe file(log) do
-              it { should be_mode 644 }
-            end
-        end
      end
 
 end
\ No newline at end of file

From c7b622526f6401629742479d9440e9acce4b9df6 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Tue, 21 Jan 2020 09:01:18 +0100
Subject: [PATCH 34/38] #158: Fix pimpmylog installation

---
 .../environments/box/modules/profiles/manifests/pimpmylog.pp   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/puppet/environments/box/modules/profiles/manifests/pimpmylog.pp b/puppet/environments/box/modules/profiles/manifests/pimpmylog.pp
index 20422e9..bea5408 100644
--- a/puppet/environments/box/modules/profiles/manifests/pimpmylog.pp
+++ b/puppet/environments/box/modules/profiles/manifests/pimpmylog.pp
@@ -10,11 +10,12 @@
     }
 
     exec { 'install-pimpmylog':
-        command => 'composer create-project potsky/pimp-my-log:1.7.* /usr/share/pimpmylog/ --no-interaction',
+        command => 'composer create-project potsky/pimp-my-log:1.7.14 /usr/share/pimpmylog/ --no-interaction',
         cwd     => '/usr/share/pimpmylog',
         unless  => 'test -d /usr/share/pimpmylog/vendor',
         path    => ['/usr/local/bin', '/usr/bin'],
         user    => vagrant,
+        timeout => 3600,
         environment => 'COMPOSER_HOME=/home/vagrant/.composer',
         require => [File['/usr/share/pimpmylog'], Anchor['php::end']]
     }

From 7fe2b174f9c30da6ab84a0ffcf904ca73ae6f511 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Tue, 21 Jan 2020 12:04:46 +0100
Subject: [PATCH 35/38] #158: Fix composer create-project commands

---
 .../environments/box/modules/profiles/manifests/phpmyadmin.pp | 3 ++-
 .../environments/box/modules/profiles/manifests/pimpmylog.pp  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/puppet/environments/box/modules/profiles/manifests/phpmyadmin.pp b/puppet/environments/box/modules/profiles/manifests/phpmyadmin.pp
index 7cacd42..d20d193 100644
--- a/puppet/environments/box/modules/profiles/manifests/phpmyadmin.pp
+++ b/puppet/environments/box/modules/profiles/manifests/phpmyadmin.pp
@@ -13,8 +13,9 @@
   }
 
   exec { 'install-phpmyadmin':
-    command => 'composer create-project phpmyadmin/phpmyadmin /usr/share/phpmyadmin "^4.7.0" -q --repository-url=https://www.phpmyadmin.net/packages.json --no-dev --no-interaction',
+    command => 'composer create-project phpmyadmin/phpmyadmin . "^4.7.0" -q --repository-url=https://www.phpmyadmin.net/packages.json --no-dev --no-interaction',
     unless  => 'test -f /usr/share/phpmyadmin/composer.json',
+    cwd     => '/usr/share/phpmyadmin/',
     path    => ['/usr/local/bin', '/usr/bin'],
     user    => vagrant,
     environment => 'COMPOSER_HOME=/home/vagrant/.composer',
diff --git a/puppet/environments/box/modules/profiles/manifests/pimpmylog.pp b/puppet/environments/box/modules/profiles/manifests/pimpmylog.pp
index bea5408..5445fd6 100644
--- a/puppet/environments/box/modules/profiles/manifests/pimpmylog.pp
+++ b/puppet/environments/box/modules/profiles/manifests/pimpmylog.pp
@@ -10,8 +10,8 @@
     }
 
     exec { 'install-pimpmylog':
-        command => 'composer create-project potsky/pimp-my-log:1.7.14 /usr/share/pimpmylog/ --no-interaction',
-        cwd     => '/usr/share/pimpmylog',
+        command => 'composer create-project potsky/pimp-my-log:1.7.14 . --no-interaction',
+        cwd     => '/usr/share/pimpmylog/',
         unless  => 'test -d /usr/share/pimpmylog/vendor',
         path    => ['/usr/local/bin', '/usr/bin'],
         user    => vagrant,

From 4c041fa36d431c202dc251e528fab08e17e7fd78 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Fri, 24 Jan 2020 10:57:35 +0100
Subject: [PATCH 36/38] #158: Disable StrictHostKeyChecking for localhost

We want to make sure the Wetty terminal can
login automatically on the first run.
---
 puppet/environments/box/modules/profiles/manifests/wetty.pp | 6 ++++++
 tests/spec/default/misc.rb                                  | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/puppet/environments/box/modules/profiles/manifests/wetty.pp b/puppet/environments/box/modules/profiles/manifests/wetty.pp
index 2ffb684..87c9f31 100644
--- a/puppet/environments/box/modules/profiles/manifests/wetty.pp
+++ b/puppet/environments/box/modules/profiles/manifests/wetty.pp
@@ -30,4 +30,10 @@
       require => Ssh_keygen['vagrant']
     }
 
+    file { '/home/vagrant/.ssh/config':
+      content => "Host localhost\n\tStrictHostKeyChecking no\n",
+      owner => vagrant,
+      group => vagrant
+    }
+
 }
\ No newline at end of file
diff --git a/tests/spec/default/misc.rb b/tests/spec/default/misc.rb
index d330ab4..799389b 100644
--- a/tests/spec/default/misc.rb
+++ b/tests/spec/default/misc.rb
@@ -40,6 +40,10 @@
         describe file('/etc/apache2/joomla.box-include.conf') do
           its(:content) { should match /Redirect permanent \/terminal http:\/\/joomla.box\/wetty/ }
         end
+
+        describe file('/home/vagrant/.ssh/config') do
+          its(:content) { should match /StrictHostKeyChecking no/ }
+        end
      end
 
      describe '### PimpMyLog' do

From 28056b8c900f9b60613e0024b9d4733d4fb5c8a4 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Fri, 24 Jan 2020 11:53:42 +0100
Subject: [PATCH 37/38] #158: Upgrade cockpit version

---
 .../environments/box/modules/profiles/manifests/box/cockpit.pp  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp b/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp
index 913c1d1..4567603 100644
--- a/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp
+++ b/puppet/environments/box/modules/profiles/manifests/box/cockpit.pp
@@ -5,7 +5,7 @@
   }
 
   package { ['cockpit', 'cockpit-ws', 'cockpit-bridge', 'cockpit-dashboard', 'cockpit-networkmanager', 'cockpit-packagekit', 'cockpit-storaged', 'cockpit-system']:
-    ensure => '210-1~ubuntu18.04.1',
+    ensure => '211-1~ubuntu18.04.1',
     notify => [Service['cockpit'], File['/usr/share/cockpit/static/login.min.html']]
   }
 

From 9f2180ca7421f1fdba4c94dd6847762bf1b689f8 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@kotuha.be>
Date: Fri, 24 Jan 2020 12:19:48 +0100
Subject: [PATCH 38/38] #158: Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6aa0daa..e01638b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ 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 (2019-12-01)
+* 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)