From 24662056dee7bd69b6a6b5c94e990cf6d7d0b0a1 Mon Sep 17 00:00:00 2001
From: Steven Rombauts <steven@timble.net>
Date: Tue, 19 Jun 2018 12:48:53 +0100
Subject: [PATCH] #120: Install tmate

---
 README.md                                             | 9 +++++++++
 puppet/Puppetfile                                     | 3 ++-
 puppet/Puppetfile.lock                                | 6 ++++--
 puppet/modules/custom/profiles/manifests/base.pp      | 4 ++++
 puppet/modules/custom/profiles/manifests/box/tools.pp | 6 ++++++
 shell/librarian-puppet.sh                             | 0
 6 files changed, 25 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 shell/librarian-puppet.sh

diff --git a/README.md b/README.md
index e6863ff..375b316 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,8 @@ For more details refer to our [FAQ](https://www.joomlatools.com/developer/tools/
 
 ## Sharing access to the box
 
+### HTTP
+
 One of the great features of Vagrant is [Vagrant Share](https://docs.vagrantup.com/v2/share/index.html). Note that Vagrant Share requires [ngrok](https://ngrok.com/) to work. We recommend you follow these set up steps first:
 
 1. Upgrade Vagrant to the latest version.
@@ -81,6 +83,13 @@ vagrant share --http 80
 
 For more options and background please refer to the [Vagrant docs](https://docs.vagrantup.com/v2/share/index.html).
 
+### SSH
+
+You can also share SSH access. There are two methods:
+
+1. With [tmate](https://tmate.io/): run the `tmate` command on the box and share the resulting ssh connection string. 
+1. Using Vagrant's built-in [SSH sharing](https://www.vagrantup.com/docs/share/ssh.html) feature.
+
 ## Hacking on the box
 
 ### Set up
diff --git a/puppet/Puppetfile b/puppet/Puppetfile
index 3539592..5a79bcc 100644
--- a/puppet/Puppetfile
+++ b/puppet/Puppetfile
@@ -14,6 +14,7 @@ mod 'example42-apache',
   :ref => 'v2.1.13'
 mod 'camptocamp-openssl', '1.2.4'
 
+mod 'maestrodev/ssh_keygen', '1.3.1'
 mod 'golja-gnupg', '1.2.3'
 mod 'petems-swap_file', '4.0.0'
 
@@ -21,4 +22,4 @@ mod 'eirc-single_user_rvm', '0.3.0'
 
 mod 'camptocamp-archive',
    :git => 'https://github.com/camptocamp/puppet-archive',
-   :ref => '0.8.1'
\ No newline at end of file
+   :ref => '0.8.1'
diff --git a/puppet/Puppetfile.lock b/puppet/Puppetfile.lock
index 6b569b2..8ce634b 100644
--- a/puppet/Puppetfile.lock
+++ b/puppet/Puppetfile.lock
@@ -14,15 +14,16 @@ FORGE
       puppetlabs-stdlib (< 5.0.0, >= 3.2.0)
     example42-monitor (2.0.4)
       example42-puppi (>= 2.0.0)
-    example42-puppi (2.2.3)
+    example42-puppi (2.2.6)
       puppetlabs-stdlib (< 5.0.0, >= 3.2.0)
-    example42-yum (2.1.28)
+    example42-yum (2.1.29)
       example42-puppi (>= 2.0.0)
     golja-gnupg (1.2.3)
     herculesteam-augeasproviders_core (2.1.4)
       puppetlabs-stdlib (< 5.0.0, >= 3.2.0)
     herculesteam-augeasproviders_sysctl (2.2.0)
       herculesteam-augeasproviders_core (< 3.0.0, >= 2.1.0)
+    maestrodev-ssh_keygen (1.3.1)
     petems-swap_file (4.0.0)
       herculesteam-augeasproviders_core (< 3.0.0, >= 2.1.0)
       herculesteam-augeasproviders_sysctl (< 3.0.0, >= 2.1.0)
@@ -79,6 +80,7 @@ DEPENDENCIES
   eirc-single_user_rvm (= 0.3.0)
   example42-apache (>= 0)
   golja-gnupg (= 1.2.3)
+  maestrodev-ssh_keygen (= 1.3.1)
   petems-swap_file (= 4.0.0)
   puppet-php (>= 0)
   puppetlabs-apt (= 2.4.0)
diff --git a/puppet/modules/custom/profiles/manifests/base.pp b/puppet/modules/custom/profiles/manifests/base.pp
index 2187334..3c6ef72 100644
--- a/puppet/modules/custom/profiles/manifests/base.pp
+++ b/puppet/modules/custom/profiles/manifests/base.pp
@@ -71,4 +71,8 @@
       content => "export JOOMLATOOLS_BOX=${::box_version}\n",
     }
 
+    ssh_keygen { 'vagrant':
+      home    => '/home/vagrant',
+    }
+
 }
\ No newline at end of file
diff --git a/puppet/modules/custom/profiles/manifests/box/tools.pp b/puppet/modules/custom/profiles/manifests/box/tools.pp
index 141f310..26ce790 100644
--- a/puppet/modules/custom/profiles/manifests/box/tools.pp
+++ b/puppet/modules/custom/profiles/manifests/box/tools.pp
@@ -54,6 +54,12 @@
     ensure => latest
   }
 
+  apt::ppa { 'ppa:tmate.io/archive': }
+
+  package { 'tmate':
+    ensure => latest
+  }
+
   file { '/usr/share/phpmetrics':
     ensure => directory,
     owner  => vagrant
diff --git a/shell/librarian-puppet.sh b/shell/librarian-puppet.sh
old mode 100644
new mode 100755